From 82ba357187ae927a138d675ca0acd856f629ab15 Mon Sep 17 00:00:00 2001
From: danielmkn <danielmi@jfrog.com>
Date: Tue, 19 Jan 2021 19:37:44 -0800
Subject: [PATCH] ARM templates. Xray template for 3.15.3

---
 .../MP_submission/createUiDefinition.json     | 26 +++++--------------
 .../Xray/MP_submission/mainTemplate.json      | 10 +++----
 .../Xray/azuredeploy_xray.parameters.json     |  2 +-
 .../Xray/azuredeploy_xray_vmss.json           | 11 +++-----
 4 files changed, 13 insertions(+), 36 deletions(-)

diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index 17931e9..47a9623 100644
--- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
@@ -123,32 +123,18 @@
             "name": "xrayVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Xray-vm image version to deploy.",
-            "defaultValue": "3.11.2",
+            "defaultValue": "3.15.3",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
                 {
-                  "label": "3.6.2",
-                  "value": "0.0.3"
+                  "label": "3.15.1",
+                  "value": "0.0.10"
                 },
                 {
-                  "label": "3.8.2",
-                  "value": "0.0.4"
-                },
-                {
-                  "label": "3.8.5",
-                  "value": "0.0.5"
-                },
-                {
-                  "label": "3.9.1",
-                  "value": "0.0.6"
-                },
-                {
-                  "label": "3.10.3",
-                  "value": "0.0.7"
-                },
-	        {                                                                                                                                                                         "label": "3.11.2",                                                                                                                                                      "value": "0.0.8"
-	        }
+                  "label": "3.15.3",
+                  "value": "0.0.11"
+                }
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 92d7a81..a9fef29 100644
--- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
@@ -19,14 +19,10 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.8",
+      "defaultValue": "0.0.11",
       "allowedValues": [
-        "0.0.3",
-        "0.0.4",
-        "0.0.5",
-        "0.0.6",
-        "0.0.7",
-	"0.0.8"
+        "0.0.10",
+	    "0.0.11"
       ],
       "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 30c98e8..718d0a1 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.8"
+      "value": "0.0.11"
     },
     "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 1874143..5c127bd 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -19,15 +19,10 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.9",
+      "defaultValue": "0.0.11",
       "allowedValues": [
-        "0.0.3",
-        "0.0.4",
-        "0.0.5",
-        "0.0.6",
-        "0.0.7",
-	"0.0.8",
-        "0.0.9"
+        "0.0.10",
+        "0.0.11"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."