Merge pull request oracle#325 from galiacheng/hotfix-for-mvn-download

rjeberhard · web-flow · commit 200bb5ca18a6 · 2024-09-11T15:42:00.000-04:00
Fix broken maven download link
diff --git a/.github/workflows/buildWlsAksArtifact.yml b/.github/workflows/buildWlsAksArtifact.yml
@@ -52,7 +52,7 @@ jobs:
                 echo "##[set-output name=artifactName;]${artifactName}"
                 echo "##[set-output name=artifactPath;]weblogic-azure/weblogic-azure-aks/target/$artifactName"
             - name: Archive weblogic-azure/weblogic-azure-aks template
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               if: success()
               with:
                 name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/buildWlsVm4AsArtifact.yml b/.github/workflows/buildWlsVm4AsArtifact.yml
@@ -94,7 +94,7 @@ jobs:
           echo "##[set-output name=artifactName;]${artifactName}-${{ env.pidType }}"
           echo "##[set-output name=artifactPath;]${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/target/$artifactName"
       - name: Archive ${{ env.offerName }} template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/buildWlsVm4CcArtifact.yml b/.github/workflows/buildWlsVm4CcArtifact.yml
@@ -92,7 +92,7 @@ jobs:
           echo "##[set-output name=artifactName;]${artifactName}-${{ env.pidType }}"
           echo "##[set-output name=artifactPath;]${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}/target/$artifactName"
       - name: Archive ${{ env.offerName }} template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/buildWlsVm4DcArtifact.yml b/.github/workflows/buildWlsVm4DcArtifact.yml
@@ -90,7 +90,7 @@ jobs:
           echo "##[set-output name=artifactName;]${artifactName}-${{ env.pidType }}"
           echo "##[set-output name=artifactPath;]${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}/target/$artifactName"
       - name: Archive ${{ env.offerName }} template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/buildWlsVm4SnArtifact.yml b/.github/workflows/buildWlsVm4SnArtifact.yml
@@ -86,7 +86,7 @@ jobs:
           echo "##[set-output name=artifactName;]${artifactName}-${{ env.pidType }}"
           echo "##[set-output name=artifactPath;]${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/target/$artifactName"
       - name: Archive ${{ env.offerName }} template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/setupWlsAksDependency.yml b/.github/workflows/setupWlsAksDependency.yml
@@ -101,7 +101,7 @@ jobs:
                 {"event_type": "aks-integration-test-without-dependency-creation", "client_payload": {"gitUserNameForArtifactsLocation": "${{ github.repository_owner }}", "testBranchNameForArtifactsLocation": "${{ github.ref }}", "isForDemo": "false", "disambiguationSuffix": "${{ github.run_id }}", "storageAccountName": "${{ env.storageAccountName }}", "storageContainerName": "${{ env.storageContainerName }}", "dbName": "${{ env.dbName }}"}}
                 EOF
             - name: Archive integration-test-data.txt
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               if: success()
               with:
                 name: integration-test-data
diff --git a/.github/workflows/testWlsAksWithDependencyCreation.yml b/.github/workflows/testWlsAksWithDependencyCreation.yml
@@ -125,7 +125,7 @@ jobs:
                 echo "##[set-output name=artifactName;]${artifactName}"
                 echo "##[set-output name=artifactPath;]weblogic-azure/weblogic-azure-aks/target/$artifactName"
             - name: Archive weblogic-azure/weblogic-azure-aks template
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               if: success()
               with:
                 name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/testWlsAksWithoutDependencyCreation.yml b/.github/workflows/testWlsAksWithoutDependencyCreation.yml
@@ -149,7 +149,7 @@ jobs:
                 echo "##[set-output name=artifactName;]${artifactName}"
                 echo "##[set-output name=artifactPath;]weblogic-azure/weblogic-azure-aks/target/$artifactName"
             - name: Archive weblogic-azure/weblogic-azure-aks template
-              uses: actions/upload-artifact@v1
+              uses: actions/upload-artifact@v4
               if: success()
               with:
                 name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/testWlsVmAdmin.yml b/.github/workflows/testWlsVmAdmin.yml
@@ -163,7 +163,7 @@ jobs:
         run: unzip ${{ env.adminOfferPath }}/target/$artifactName.zip -d ${{ env.adminOfferPath }}/target/$artifactName
 
       - name: Archive ${{ env.offerName }} template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.artifact_file.outputs.artifactName}}
diff --git a/.github/workflows/testWlsVmCluster.yml b/.github/workflows/testWlsVmCluster.yml
@@ -149,7 +149,7 @@ jobs:
           echo "##[set-output name=artifactName;]${artifactName}"
           echo "##[set-output name=artifactPath;]${{ env.offerPath }}/${{ env.offerName }}/target/$artifactName"
       - name: Archive ${{ env.offerName }} template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.artifact_file.outputs.artifactName}}
@@ -165,7 +165,7 @@ jobs:
           echo "##[set-output name=addnode_artifactName;]${addnode_artifactName}"
           echo "##[set-output name=addnode_artifactPath;]${{ env.offerPath }}/addnode/target/$addnode_artifactName"
       - name: Archive ${{ env.offerName }} addnode template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.addnode_artifact_file.outputs.addnode_artifactName}}
@@ -181,7 +181,7 @@ jobs:
           echo "##[set-output name=deletenode_artifactPath;]${{ env.offerPath }}/deletenode/target/$deletenode_artifactName"
 
       - name: Archive ${{ env.offerName }} deletenode template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.deletenode_artifact_file.outputs.deletenode_artifactName}}
@@ -197,7 +197,7 @@ jobs:
           echo "##[set-output name=addnode_coherence_artifactPath;]${{ env.offerPath }}/addnode-coherence/target/$addnode_coherence_artifactName"
 
       - name: Archive ${{ env.offerName }} addnode-coherence template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.addnode_coherence_artifact_file.outputs.addnode_coherence_artifactName}}
diff --git a/.github/workflows/testWlsVmDynamicCluster.yml b/.github/workflows/testWlsVmDynamicCluster.yml
@@ -128,7 +128,7 @@ jobs:
           echo "##[set-output name=artifactName;]${artifactName}"
           echo "##[set-output name=artifactPath;]${offerPath}/${{ env.offerName }}/target/$artifactName"
       - name: Archive ${{env.offerName}} template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.artifact_file.outputs.artifactName}}
@@ -143,7 +143,7 @@ jobs:
           echo "##[set-output name=addnode_artifactName;]${addnode_artifactName}"
           echo "##[set-output name=addnode_artifactPath;]${offerPath}/addnode/target/$addnode_artifactName"
       - name: Archive ${{env.offerName}} addnode template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.addnode_artifact_file.outputs.addnode_artifactName}}
@@ -159,7 +159,7 @@ jobs:
           echo "##[set-output name=deletenode_artifactPath;]${offerPath}/deletenode/target/$deletenode_artifactName"
 
       - name: Archive ${{env.offerName}} deletenode template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.deletenode_artifact_file.outputs.deletenode_artifactName}}
@@ -175,7 +175,7 @@ jobs:
           echo "##[set-output name=addnode_coherence_artifactPath;]${offerPath}/addnode-coherence/target/$addnode_coherence_artifactName"
 
       - name: Archive ${{env.offerName}} addnode-coherence template
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         if: success()
         with:
           name: ${{steps.addnode_coherence_artifact_file.outputs.addnode_coherence_artifactName}}
diff --git a/pom.xml b/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.28</version.arm-oraclelinux-wls>
-        <version.arm-oraclelinux-wls-admin>1.0.52</version.arm-oraclelinux-wls-admin>
-        <version.arm-oraclelinux-wls-cluster>1.0.680000</version.arm-oraclelinux-wls-cluster>
-        <version.arm-oraclelinux-wls-dynamic-cluster>1.0.51</version.arm-oraclelinux-wls-dynamic-cluster>
+        <version.arm-oraclelinux-wls-admin>1.0.53</version.arm-oraclelinux-wls-admin>
+        <version.arm-oraclelinux-wls-cluster>1.0.690000</version.arm-oraclelinux-wls-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>
diff --git a/resources/azure-common.properties b/resources/azure-common.properties
@@ -35,7 +35,7 @@ azure.apiVersionForInsightsWorkspaces=2022-10-01
 # Microsoft.Resources/deploymentScripts
 azure.apiVersionForDeploymentScript=2023-08-01
 # Microsoft.Resources/deployments
-azure.apiVersionForDeployment=2022-09-01
+azure.apiVersionForDeployment=2023-07-01
 # Microsoft.Resources/tags
 azure.apiVersionForTags=2023-07-01
 # Microsoft.Storage/storageAccounts
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/installJdbcDrivers.sh b/weblogic-azure-vm/arm-oraclelinux-wls-admin/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
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/installJdbcDrivers.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-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
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/installJdbcDrivers.sh b/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
