Adds link to VM docs in UI. Fixes arm-ttk violations. Fixes oracle#130.

modified: weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json ```json { "name": "help", "type": "Microsoft.Common.TextBlock", "visible": true, "options": { "text": "See the documentation for this offer.", "link": { "label": "Offer documentation", "uri": "https://aka.ms/wls-vm-docs" } } }, ``` modified: .github/workflows/buildWlsVm4AsArtifact.yml modified: .github/workflows/buildWlsVm4CcArtifact.yml modified: .github/workflows/buildWlsVm4DcArtifact.yml modified: .github/workflows/buildWlsVm4SnArtifact.yml Make these uniform with respect to: - handling of pid files downloaded via a maven property. - version of arm-ttk and azure-javaee-iaas parent pom. - cURL example URL correctness. - Applying the workaround from [oracle#130](oracle#130 (comment)). modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/pom.xml modified: weblogic-azure-vm/arm-oraclelinux-wls/pom.xml - Increment version of `azure-javaee-iaas-parent`. - Increment version for Partner Center. - Handling of pid files downloaded via a maven property. modified: weblogic-azure-vm/arm-oraclelinux-wls/src/main/resources/microsoft-pid.properties modified: weblogic-azure-vm/arm-oraclelinux-wls/src/main/resources/pid.properties - Fix numerous arm-ttx violations due to out of date `apiVersion` values. modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/dbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/elkNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/nsgNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode-coherence/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/appGatewayNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/dbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-cluster/deletenode/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode-coherence/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/aadNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/clusterTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/dbTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/elkNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/nestedtemplates/ohsNestedTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/deletenode/src/main/arm/mainTemplate.json modified: weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json - Fix arm-ttk violations related to use of `concat()`. - Update `apiVersion` occurrences, with help from pid files.
azure-javaee · Jun 4, 2022 · ae35f05 · ae35f05
1 parent 97af0af
commit ae35f05
Show file tree

Hide file tree

Showing 50 changed files with 350 additions and 198 deletions.
diff --git a/.github/workflows/buildWlsVm4AsArtifact.yml b/.github/workflows/buildWlsVm4AsArtifact.yml
@@ -18,8 +18,8 @@ on:
   # Sample cURL
   # curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "vms-admin-package",  "client_payload": {"pidType": "microsoft", "ref": "refs/heads/main"}}'
 env:
-  refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece
-  refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4
+  refArmttk: cf5c927eaf1f5652556e86a6b67816fc910d1b74
+  refJavaee: f25ab89a2a8848da39b84e5d6c927f4c4cb47200
   offerName: "arm-oraclelinux-wls-admin"
   repoName: "weblogic-azure"
   repoOwner: ${{ secrets.USER_NAME }}

diff --git a/.github/workflows/buildWlsVm4CcArtifact.yml b/.github/workflows/buildWlsVm4CcArtifact.yml
@@ -17,17 +17,38 @@ on:
         required: false
         default: 'refs/heads/main'
   # Sample cURL
-  # curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "vms-configured-cluster-package}'
+  # curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "vms-configured-cluster-package", "client_payload": {"pidType": "microsoft", "ref": "refs/heads/main"} }'
 env:
-  refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece
-  refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4
+  refArmttk: cf5c927eaf1f5652556e86a6b67816fc910d1b74
+  refJavaee: f25ab89a2a8848da39b84e5d6c927f4c4cb47200
   offerName: "arm-oraclelinux-wls-cluster"
   repoName: "weblogic-azure"
+  repoOwner: ${{ secrets.USER_NAME }}
 
 jobs:
   package:
     runs-on: ubuntu-latest
     steps:
+      - name: Setup environment variables
+        id: setup-env-variables-based-on-dispatch-event
+        run: |
+          if [ ${{ github.event_name }} == 'workflow_dispatch' ]; then
+            pidType=${{ github.event.inputs.pidType }}
+            ref=${{ github.event.inputs.ref }}
+          else
+            pidType=${{ github.event.client_payload.pidType }}
+            ref=${{ github.event.client_payload.ref }}
+          fi
+          if [ -z "$pidType" ]; then
+            pidType='microsoft'
+          fi
+          if [ -z "$ref" ]; then
+            ref='refs/heads/main'
+          fi
+          echo "##[set-output name=pidType;]${pidType}"
+          echo "##[set-output name=ref;]${ref}"
+          echo "pidType=${pidType}" >> $GITHUB_ENV
+          echo "ref=${ref}" >> $GITHUB_ENV
       - name: Checkout azure-javaee-iaas
         uses: actions/checkout@v2
         with:
@@ -55,27 +76,27 @@ jobs:
         run:  |
            cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}
            find . -name "*.json" | xargs sed -i 's|../../../../../utilities|../utilities|g' $1
-      - name: Build and test ${{ env.offerName }} using ${{ github.event.inputs.pidType }} pids
+      - name: Build and test ${{ env.offerName }} using ${{ env.pidType }} pids
         run: |
-          cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}
-          pidType=${{ github.event.inputs.pidType }}
+          cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}
+          pidType=${{ env.pidType }}
           if [[ "${pidType}" == "oracle" ]];then
             echo "using oracle pid"
-            mvn -Ptemplate-validation-tests clean install
+            mvn -Ptemplate-validation-tests clean install -Dgit.repo.owner=${{ env.repoOwner }} -Dgit.tag=${{ env.ref }}
           else
             echo "using ms pid"
-            mvn -Ptemplate-validation-tests clean install -Ddev
+            mvn -Ptemplate-validation-tests clean install -Ddev -Dgit.repo.owner=${{ env.repoOwner }} -Dgit.tag=${{ env.ref }}
           fi
 
       - name: Generate artifact file name and path
         id: artifact_file
         run: |
-          offerPath=${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}
-          version=$(awk '/<version>[^<]+<\/version>/{gsub(/<version>|<\/version>/,"",$1);print $1;exit;}' ${offerPath}/pom.xml)
+          cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}
+          version=$(awk '/<version>[^<]+<\/version>/{gsub(/<version>|<\/version>/,"",$1);print $1;exit;}' pom.xml)
           artifactName=${{ env.offerName }}-$version-arm-assembly
-          unzip ${offerPath}/target/$artifactName.zip -d ${offerPath}/target/$artifactName
-          echo "##[set-output name=artifactName;]${artifactName}-${{ github.event.inputs.pidType }}"
-          echo "##[set-output name=artifactPath;]${offerPath}/target/$artifactName"
+          unzip target/$artifactName.zip -d target/$artifactName
+          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
         if: success()

diff --git a/.github/workflows/buildWlsVm4DcArtifact.yml b/.github/workflows/buildWlsVm4DcArtifact.yml
@@ -17,17 +17,39 @@ on:
         required: false
         default: 'refs/heads/main'
   # Sample cURL
-  # curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "vms-dynamic-cluster-package}'
+  # curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "vms-dynamic-cluster-package", "client_payload": {"pidType": "microsoft", "ref": "refs/heads/main"}}'
 env:
-  refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece
-  refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4
+  refArmttk: cf5c927eaf1f5652556e86a6b67816fc910d1b74
+  refJavaee: f25ab89a2a8848da39b84e5d6c927f4c4cb47200
   offerName: "arm-oraclelinux-wls-dynamic-cluster"
   repoName: "weblogic-azure"
+  repoOwner: ${{ secrets.USER_NAME }}
+
 
 jobs:
   package:
     runs-on: ubuntu-latest
     steps:
+      - name: Setup environment variables
+        id: setup-env-variables-based-on-dispatch-event
+        run: |
+          if [ ${{ github.event_name }} == 'workflow_dispatch' ]; then
+            pidType=${{ github.event.inputs.pidType }}
+            ref=${{ github.event.inputs.ref }}
+          else
+            pidType=${{ github.event.client_payload.pidType }}
+            ref=${{ github.event.client_payload.ref }}
+          fi
+          if [ -z "$pidType" ]; then
+            pidType='microsoft'
+          fi
+          if [ -z "$ref" ]; then
+            ref='refs/heads/main'
+          fi
+          echo "##[set-output name=pidType;]${pidType}"
+          echo "##[set-output name=ref;]${ref}"
+          echo "pidType=${pidType}" >> $GITHUB_ENV
+          echo "ref=${ref}" >> $GITHUB_ENV
       - name: Checkout azure-javaee-iaas
         uses: actions/checkout@v2
         with:
@@ -55,28 +77,28 @@ jobs:
         run:  |
            cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}
            find . -name "*.json" | xargs sed -i 's|../../../../../utilities|../utilities|g' $1
-      - name: Build and test ${{ env.offerName }} using ${{ github.event.inputs.pidType }} pids
+      - name: Build and test ${{ env.offerName }} using ${{ env.pidType }} pids
         run: |
-          cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}
-          pidType=${{ github.event.inputs.pidType }}
+          cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}
+          pidType=${{ env.pidType }}
           echo ${pidType}
           if [[ "${pidType}" == "oracle" ]];then
             echo "using oracle pids"
-            mvn -Ptemplate-validation-tests clean install
+            mvn -Ptemplate-validation-tests clean install -Dgit.repo.owner=${{ env.repoOwner }} -Dgit.tag=${{ env.ref }}
           else
             echo "using ms pids"
-            mvn -Ptemplate-validation-tests clean install -Ddev
+            mvn -Ptemplate-validation-tests clean install -Ddev -Dgit.repo.owner=${{ env.repoOwner }} -Dgit.tag=${{ env.ref }}
           fi
 
       - name: Generate artifact file name and path
         id: artifact_file
         run: |
-          offerPath=${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}
-          version=$(awk '/<version>[^<]+<\/version>/{gsub(/<version>|<\/version>/,"",$1);print $1;exit;}' ${offerPath}/pom.xml)
+          cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}/${{ env.offerName }}
+          version=$(awk '/<version>[^<]+<\/version>/{gsub(/<version>|<\/version>/,"",$1);print $1;exit;}' pom.xml)
           artifactName=${{ env.offerName }}-$version-arm-assembly
-          unzip ${offerPath}/target/$artifactName.zip -d ${offerPath}/target/$artifactName
-          echo "##[set-output name=artifactName;]${artifactName}-${{ github.event.inputs.pidType }}"
-          echo "##[set-output name=artifactPath;]${offerPath}/target/$artifactName"
+          unzip target/$artifactName.zip -d target/$artifactName
+          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
         if: success()

diff --git a/.github/workflows/buildWlsVm4SnArtifact.yml b/.github/workflows/buildWlsVm4SnArtifact.yml
@@ -16,17 +16,41 @@ on:
         required: false
         default: 'refs/heads/main'
   # Sample cURL
-  # curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "vms-single-node-package}'
+  # curl --verbose -X POST https://api.github.com/repos/<github_user>/weblogic-azure/dispatches -H 'Accept: application/vnd.github.everest-preview+json' -H 'Authorization: token <personal_access_token>' --data '{"event_type": "vms-single-node-package",  "client_payload": {"pidType": "microsoft", "ref": "refs/heads/main"}}'
 env:
-  refArmttk: 7dc2c2a7822c2825ea3524ac2af72e561847fece
-  refJavaee: 062fe0eb4e72012ead98c23e1a1b2c6259e7e7c4
+  refArmttk: cf5c927eaf1f5652556e86a6b67816fc910d1b74
+  refJavaee: f25ab89a2a8848da39b84e5d6c927f4c4cb47200
   offerName: "arm-oraclelinux-wls"
   repoName: "weblogic-azure"
+  repoOwner: ${{ secrets.USER_NAME }}
 
 jobs:
   package:
     runs-on: ubuntu-latest
     steps:
+      - name: Setup environment variables
+        id: setup-env-variables-based-on-dispatch-event
+        run: |
+          if [ ${{ github.event_name }} == 'workflow_dispatch' ]; then
+            pidType=${{ github.event.inputs.pidType }}
+            ref=${{ github.event.inputs.ref }}
+          else
+            pidType=${{ github.event.client_payload.pidType }}
+            ref=${{ github.event.client_payload.ref }}
+          fi
+
+          if [ -z "$pidType" ]; then
+            pidType='microsoft'
+          fi
+
+          if [ -z "$ref" ]; then
+            ref='refs/heads/main'
+          fi
+
+          echo "##[set-output name=pidType;]${pidType}"
+          echo "##[set-output name=ref;]${ref}"
+          echo "pidType=${pidType}" >> $GITHUB_ENV
+          echo "ref=${ref}" >> $GITHUB_ENV
       - name: Checkout azure-javaee-iaas
         uses: actions/checkout@v2
         with:
@@ -51,27 +75,27 @@ jobs:
       - name: Build azure-javaee-iaas
         run: mvn -DskipTests clean install --file azure-javaee-iaas/pom.xml
 
-      - name: Build and test ${{ env.offerName }} using ${{ github.event.inputs.pidType }} pids
+      - name: Build and test ${{ env.offerName }} using ${{ env.pidType }} pids
         run: |
           cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}
-          pidType=${{ github.event.inputs.pidType }}
+          pidType=${{ env.pidType }}
           if [[ "${pidType}" == "oracle" ]];then
             echo "using oracle pid"
-            mvn -Ptemplate-validation-tests clean install
+            mvn -Ptemplate-validation-tests clean install -Dgit.repo.owner=${{ env.repoOwner }} -Dgit.tag=${{ env.ref }}
           else
             echo "using ms pid"
-            mvn -Ptemplate-validation-tests clean install -Ddev
+            mvn -Ptemplate-validation-tests clean install -Ddev -Dgit.repo.owner=${{ env.repoOwner }} -Dgit.tag=${{ env.ref }}
           fi
 
       - name: Generate artifact file name and path
         id: artifact_file
         run: |
-          offerPath=${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}
-          version=$(awk '/<version>[^<]+<\/version>/{gsub(/<version>|<\/version>/,"",$1);print $1;exit;}' ${offerPath}/pom.xml)
+          cd ${{env.repoName}}/weblogic-azure-vm/${{ env.offerName }}
+          version=$(awk '/<version>[^<]+<\/version>/{gsub(/<version>|<\/version>/,"",$1);print $1;exit;}' pom.xml)
           artifactName=${{ env.offerName }}-$version-arm-assembly
-          unzip ${offerPath}/target/$artifactName.zip -d ${offerPath}/target/$artifactName
-          echo "##[set-output name=artifactName;]${artifactName}-${{ github.event.inputs.pidType }}"
-          echo "##[set-output name=artifactPath;]${offerPath}/target/$artifactName"
+          unzip target/$artifactName.zip -d target/$artifactName
+          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
         if: success()

diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>com.microsoft.azure.iaas</groupId>
         <artifactId>azure-javaee-iaas-parent</artifactId>
-        <version>1.0.15</version>
+        <version>1.0.16</version>
         <relativePath></relativePath>
     </parent>
 

diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml b/weblogic-azure-vm/arm-oraclelinux-wls-admin/pom.xml
@@ -10,12 +10,12 @@
 
     <groupId>com.oracle.weblogic.azure</groupId>
     <artifactId>arm-oraclelinux-wls-admin</artifactId>
-    <version>1.0.30</version>
+    <version>1.0.31</version>
 
     <parent>
         <groupId>com.microsoft.azure.iaas</groupId>
         <artifactId>azure-javaee-iaas-parent</artifactId>
-        <version>1.0.15</version>
+        <version>1.0.16</version>
         <relativePath></relativePath>
     </parent>
     <packaging>pom</packaging>

diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json
@@ -239,6 +239,18 @@
                 "type": "Microsoft.Common.Section",
                 "label": "Report issues, get help, and share feedback",
                 "elements": [
+                    {
+                        "name": "help",
+                        "type": "Microsoft.Common.TextBlock",
+                        "visible": true,
+                        "options": {
+                            "text": "See the documentation for this offer.",
+                            "link": {
+                                "label": "Offer documentation",
+                                "uri": "https://aka.ms/wls-vm-docs"
+                            }
+                        }
+                    },
                     {
                         "name": "howToReportIssueText",
                         "type": "Microsoft.Common.TextBlock",

diff --git a/...ic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json b/...ic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/aadNestedTemplate.json
@@ -159,8 +159,8 @@
             }
         },
         {
+            "apiVersion": "${azure.apiVersionForVirtualMachines}",
             "type": "Microsoft.Compute/virtualMachines/extensions",
-            "apiVersion": "${azure.apiVersion}",
             "name": "[concat(parameters('adminVMName'),'/newuserscript')]",
             "location": "[parameters('location')]",
             "properties": {

diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json
@@ -263,7 +263,7 @@
       },
       {
          "type": "Microsoft.Network/networkSecurityGroups",
-         "apiVersion": "${azure.apiVersion}",
+         "apiVersion": "${azure.apiVersionForNetworkSecurityGroups}",
          "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]",
          "name": "[variables('name_networkSecurityGroup')]",
          "location": "[parameters('location')]",
@@ -377,8 +377,8 @@
          }
       },
       {
+         "apiVersion": "${azure.apiVersionForPublicIPAddresses}",
          "type": "Microsoft.Network/publicIPAddresses",
-         "apiVersion": "${azure.apiVersion}",
          "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]",
          "name": "[variables('name_publicIPAddress')]",
          "location": "[parameters('location')]",
@@ -390,8 +390,8 @@
          }
       },
       {
+         "apiVersion": "${azure.apiVersionForVirtualNetworks}",
          "type": "Microsoft.Network/virtualNetworks",
-         "apiVersion": "${azure.apiVersion}",
          "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]",
          "name": "[variables('name_virtualNetwork')]",
          "location": "[parameters('location')]",
@@ -416,8 +416,8 @@
          }
       },
       {
+         "apiVersion": "${azure.apiVersionForNetworkInterfaces}",
          "type": "Microsoft.Network/networkInterfaces",
-         "apiVersion": "${azure.apiVersion}",
          "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'new')]",
          "name": "[variables('name_nic_with_pub_ip')]",
          "location": "[parameters('location')]",
@@ -446,8 +446,8 @@
          }
       },
       {
+         "apiVersion": "${azure.apiVersionForNetworkInterfaces}",
          "type": "Microsoft.Network/networkInterfaces",
-         "apiVersion": "${azure.apiVersion}",
          "condition": "[equals(parameters('virtualNetworkNewOrExisting'), 'existing')]",
          "name": "[variables('name_nic_without_pub_ip')]",
          "location": "[parameters('location')]",
@@ -466,8 +466,8 @@
          }
       },
       {
+         "apiVersion": "${azure.apiVersionForVirtualMachines}",
          "type": "Microsoft.Compute/virtualMachines",
-         "apiVersion": "${azure.apiVersion}",
          "name": "[parameters('adminVMName')]",
          "location": "[parameters('location')]",
          "dependsOn": [
@@ -522,8 +522,8 @@
       },
       {
          "name": "[concat(parameters('adminVMName'),'/newuserscript')]",
+         "apiVersion": "${azure.apiVersionForVirtualMachines}",
          "type": "Microsoft.Compute/virtualMachines/extensions",
-         "apiVersion": "${azure.apiVersion}",
          "location": "[parameters('location')]",
          "dependsOn": [
             "[resourceId('Microsoft.Compute/virtualMachines/', parameters('adminVMName'))]",