Merge remote-tracking branch 'oracle/main' into tags-for-resources

Author: galiacheng

pom.xml

@@ -43,9 +43,9 @@
         <version.wls-on-aks-azure-marketplace>1.0.81</version.wls-on-aks-azure-marketplace>
         <!--  weblogic azure vm versions  -->
         <version.arm-oraclelinux-wls>1.0.29</version.arm-oraclelinux-wls>
-        <version.arm-oraclelinux-wls-admin>1.0.53</version.arm-oraclelinux-wls-admin>
+        <version.arm-oraclelinux-wls-admin>1.0.54</version.arm-oraclelinux-wls-admin>
         <version.arm-oraclelinux-wls-cluster>1.0.700000</version.arm-oraclelinux-wls-cluster>
-        <version.arm-oraclelinux-wls-dynamic-cluster>1.0.51</version.arm-oraclelinux-wls-dynamic-cluster>
+        <version.arm-oraclelinux-wls-dynamic-cluster>1.0.52</version.arm-oraclelinux-wls-dynamic-cluster>
         <!--  node versions  -->
         <version.arm-oraclelinux-wls-dynamic-cluster-addnode>1.0.7</version.arm-oraclelinux-wls-dynamic-cluster-addnode>
         <version.arm-oraclelinux-wls-dynamic-cluster-addnode-coherence>1.0.3</version.arm-oraclelinux-wls-dynamic-cluster-addnode-coherence>

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

@@ -245,6 +245,13 @@ export gitUrl4AzureIdentityExtensionPomFile="https://raw.githubusercontent.com/o
 export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
 export retryMaxAttempt=5 # retry attempt for curl command
 export mvnInstaller="apache-maven-bin.tar.gz"
+
+# 2024-09-11 https://github.com/oracle/weblogic-azure/pull/325
+# Increase maintainability by putting URL behind redirector. As of today
+# target is https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+# A better solution would be if Oracle had an employee accessible URL redirector
+# service similar to Microsoft's aka.ms. 
+
 export url4MavenInstaller="https://aka.ms/wls-offer-maven-download-url"
 export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
 

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

@@ -245,6 +245,13 @@ export gitUrl4AzureIdentityExtensionPomFile="https://raw.githubusercontent.com/o
 export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
 export retryMaxAttempt=5 # retry attempt for curl command
 export mvnInstaller="apache-maven-bin.tar.gz"
+
+# 2024-09-11 https://github.com/oracle/weblogic-azure/pull/325
+# Increase maintainability by putting URL behind redirector. As of today
+# target is https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+# A better solution would be if Oracle had an employee accessible URL redirector
+# service similar to Microsoft's aka.ms. 
+
 export url4MavenInstaller="https://aka.ms/wls-offer-maven-download-url"
 export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
 

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

@@ -67,13 +67,17 @@ function validate_input() {
 }
 
 function install_maven() {
-    curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${url4MavenInstaller}" -o ${mvnInstaller}
+    local mavenUrl=$(curl -Ls -o /dev/null -w %{url_effective} ${url4MavenInstaller})
     if [ $? != 0 ]; then
-        echo_stderr "Failed to download ${url4MavenInstaller}."
+        echo_stderr "Failed to get maven download url."
+    fi
+    curl -m ${curlMaxTime} --retry ${retryMaxAttempt} -fksL "${mavenUrl}" -o ${mvnInstaller}
+    if [ $? != 0 ]; then
+        echo_stderr "Failed to download ${mavenUrl}."
     fi
 
     tar xzvf ${mvnInstaller} -C /u01/app
-    export MAVEN_HOME=/u01/app/apache-maven-${mvnVersion}
+    export MAVEN_HOME=$(find /u01/app -maxdepth 1 -type d -name "apache-maven*")
     . $oracleHome/oracle_common/common/bin/setWlstEnv.sh # set JAVA_HOME
     export PATH=${MAVEN_HOME}/bin:$PATH
 
@@ -239,10 +243,16 @@ read oracleHome domainPath wlsServerName wlsAdminHost wlsAdminPort wlsUserName w
 export curlMaxTime=120 # seconds
 export gitUrl4AzureIdentityExtensionPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/azure-identity-extensions.xml"
 export gitUrl4MySQLDriverPomFile="https://raw.githubusercontent.com/oracle/weblogic-azure/main/weblogic-azure-aks/src/main/resources/mysql-connector-java.xml"
-export mvnVersion="3.9.0"
-export mvnInstaller="apache-maven-${mvnVersion}-bin.tar.gz"
 export retryMaxAttempt=5 # retry attempt for curl command
-export url4MavenInstaller="https://dlcdn.apache.org/maven/maven-3/${mvnVersion}/binaries/${mvnInstaller}"
+export mvnInstaller="apache-maven-bin.tar.gz"
+
+# 2024-09-11 https://github.com/oracle/weblogic-azure/pull/325
+# Increase maintainability by putting URL behind redirector. As of today
+# target is https://dlcdn.apache.org/maven/maven-3/3.9.9/binaries/apache-maven-3.9.9-bin.tar.gz
+# A better solution would be if Oracle had an employee accessible URL redirector
+# service similar to Microsoft's aka.ms. 
+
+export url4MavenInstaller="https://aka.ms/wls-offer-maven-download-url"
 export wlsAdminURL=$wlsAdminHost:$wlsAdminPort
 
 validate_input