Merge branch 'arm-7.33.9' of https://github.com/jfrog/JFrog-Cloud-Installers into arm-7.33.9

AzureResourceManager/Xray/MP_submission/createUiDefinition.json

@@ -206,6 +206,10 @@
 		{
                   "label": "3.38.2",
                   "value": "0.0.32"
+                },
+		{
+		  "label": "3.41.4",
+		  "value": "0.0.33"
 		}
               ],
               "required": true

AzureResourceManager/Xray/MP_submission/mainTemplate.json

@@ -19,7 +19,7 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.32",
+      "defaultValue": "0.0.33",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -40,7 +40,8 @@
 	"0.0.29",
 	"0.0.30",
 	"0.0.31",
-	"0.0.32"
+	"0.0.32",
+	"0.0.33"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."

AzureResourceManager/Xray/azuredeploy_xray.parameters.json

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

AzureResourceManager/Xray/azuredeploy_xray_vmss.json

@@ -19,7 +19,7 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.32",
+      "defaultValue": "0.0.33",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -40,7 +40,8 @@
 	"0.0.29",
 	"0.0.30",
 	"0.0.31",
-	"0.0.32"      
+	"0.0.32",
+	"0.0.33"      
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."

AzureResourceManager/Xray/vm_install/vm_parameters.json

@@ -87,10 +87,10 @@
             "value": "vmuser"
         },
         "adminPassword": {
-            "value": "Password!123"
+            "value": "OWERWRITE_THE_PASSWORD"
         },
         "xrayVersion": {
-            "value": "3.41.4"
+            "value": "OWERWRITE_LATEST_VERSION"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"