updated all changes for artifactory 7.21.12 & xray 3.29.0

AzureResourceManager/Xray/MP_submission/createUiDefinition.json

@@ -176,7 +176,7 @@
                   "value": "0.0.24"
                 },
                 {
-	              "label": "3.29.0",
+	          "label": "3.29.0",
                   "value": "0.0.25"
 		        }
               ],

AzureResourceManager/Xray/azuredeploy_xray.parameters.json

@@ -33,7 +33,7 @@
       "value": "10.0.1.0/24"
     },
     "xrayVersion": {
-      "value": "0.0.24"
+      "value": "0.0.25"
     },
     "artifactoryURL": {
       "value": "http://ARTIFACTORY-URL.cloudapp.azure.com"

AzureResourceManager/Xray/azuredeploy_xray_vmss.json

@@ -201,7 +201,7 @@
     "joinKey": "[parameters('joinKey')]",
     "osType": {
       "publisher": "jfrog",
-      "offer": "x-ray-vm-preview",
+      "offer": "x-ray-vm",
       "sku": "x-ray-vm",
       "version": "[parameters('xrayVersion')]"
     },
@@ -337,7 +337,7 @@
       "plan": {
         "name": "x-ray-vm",
         "publisher": "jfrog",
-        "product": "x-ray-vm-preview"
+        "product": "x-ray-vm"
       },
       "sku": {
         "name": "[parameters('virtualMachineSize')]",