From cec955118397c848919fd7e28e641ed8f928b107 Mon Sep 17 00:00:00 2001
From: Logeshwarsn <Logeshwars@jfrog.com>
Date: Fri, 11 Feb 2022 16:24:09 +0530
Subject: [PATCH] updated Artifactory version

---
 .../Xray/MP_submission/createUiDefinition.json              | 6 +++++-
 AzureResourceManager/Xray/MP_submission/mainTemplate.json   | 5 +++--
 AzureResourceManager/Xray/azuredeploy_xray.parameters.json  | 2 +-
 AzureResourceManager/Xray/azuredeploy_xray_vmss.json        | 5 +++--
 AzureResourceManager/Xray/vm_install/vm_parameters.json     | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index c9f9ffb..8c96c2e 100644
--- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
@@ -206,7 +206,11 @@
 		{
                   "label": "3.38.2",
                   "value": "0.0.32"
-                }
+                },
+		{
+		  "label": "3.41.4",
+		  "value": "0.0.33"
+		}
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 1c88c6e..c8039a8 100644
--- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json
+++ b/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."
diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json
index 51308d0..3837de2 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json
+++ b/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"
diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
index af3f90a..7eb46b9 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/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."
diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json
index a5ac44b..e9b0674 100644
--- a/AzureResourceManager/Xray/vm_install/vm_parameters.json
+++ b/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"