From 9bcbf71b5c41a105a0c5eb812ee8cbd4f815b90a Mon Sep 17 00:00:00 2001
From: Anup Singh <64248163+anupteal@users.noreply.github.com>
Date: Tue, 20 Jul 2021 23:18:29 +0530
Subject: [PATCH] Arm 7.21.3 (#143)

* updated templates file for artifactory 7.21.3 & xray 3.27.2

* Updated all changes for artifactory 7.21.3 & xray 3.27.2
---
 .../Artifactory/MP_submission/createUiDefinition.json     | 6 +++++-
 .../Artifactory/MP_submission/mainTemplate.json           | 5 +++--
 AzureResourceManager/Artifactory/azuredeploy.json         | 5 +++--
 .../Xray/MP_submission/createUiDefinition.json            | 8 ++++++--
 AzureResourceManager/Xray/MP_submission/mainTemplate.json | 5 +++--
 .../Xray/azuredeploy_xray.parameters.json                 | 2 +-
 AzureResourceManager/Xray/azuredeploy_xray_vmss.json      | 5 +++--
 7 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index cc02bdd..b32569a 100644
--- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
@@ -132,7 +132,7 @@
             "name": "artifactoryVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Artifactory-vm image version to deploy.",
-            "defaultValue": "7.19.4",
+            "defaultValue": "7.21.3",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -171,6 +171,10 @@
 		{
 		  "label": "7.19.4",
 		  "value": "0.0.19"
+		},
+		{
+		  "lable": "7.21.3",
+		  "value": "0.0.21"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index ce71956..3b36e37 100644
--- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
+++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.19",
+      "defaultValue": "0.0.21",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -89,7 +89,8 @@
 	    "0.0.14",
 	    "0.0.15",
 	    "0.0.18",
-	    "0.0.19"
+	    "0.0.19",
+	    "0.0.21"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index ff6d441..5c69e2a 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.19",
+      "defaultValue": "0.0.21",
       "allowedValues": [
 	    "0.0.8",
         "0.0.9",
@@ -89,7 +89,8 @@
 	    "0.0.14",
 	    "0.0.15",
 	    "0.0.18",
-	    "0.0.19"
+	    "0.0.19",
+	    "0.0.21"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index f937de8..fd36608 100644
--- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
+++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
@@ -123,7 +123,7 @@
             "name": "xrayVersion",
             "type": "Microsoft.Common.DropDown",
             "label": "Xray-vm image version to deploy.",
-            "defaultValue": "3.25.1",
+            "defaultValue": "3.27.2",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -166,7 +166,11 @@
                 {
                   "label": "3.25.1",
                   "value": "0.0.22"
-                }
+                },
+		{
+		  "label": "3.27.2",
+		  "value": "0.0.23"
+		}
               ],
               "required": true
             },
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index c9ffacc..1c0a173 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.22",
+      "defaultValue": "0.0.23",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -30,7 +30,8 @@
 	"0.0.18",
 	"0.0.20",
 	"0.0.21",
-	"0.0.22"
+	"0.0.22",
+	"0.0.23"
       ],
       "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 5e76760..9f24d86 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.22"
+      "value": "0.0.23"
     },
     "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 cbcb68f..4dea195 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.22",
+      "defaultValue": "0.0.23",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -30,7 +30,8 @@
         "0.0.18",
         "0.0.20",
         "0.0.21",
-        "0.0.22"
+        "0.0.22",
+	"0.0.23"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."