From 4a226112a80ccc56c6cee413cc8b4a8886cf774c Mon Sep 17 00:00:00 2001
From: Anup Singh <64248163+anupteal@users.noreply.github.com>
Date: Mon, 18 Oct 2021 21:41:12 +0530
Subject: [PATCH] Updated changes in all requires files for artifactory 7.27.3
 & xray 3.33.3 (#170)

---
 .../Artifactory/MP_submission/createUiDefinition.json       | 6 +++++-
 .../Artifactory/MP_submission/mainTemplate.json             | 5 +++--
 AzureResourceManager/Artifactory/azuredeploy.json           | 5 +++--
 .../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 +++--
 7 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index c1f2ad2..9870c59 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.25.7",
+            "defaultValue": "7.27.3",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -195,6 +195,10 @@
 		{
 		  "label": "7.25.7",
 		  "value": "0.0.28"
+		},
+		{
+		  "label": "7.27.3",
+		  "value": "0.0.29"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 26edffb..52108c8 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.28",
+      "defaultValue": "0.0.29",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -95,7 +95,8 @@
 	    "0.0.23",
 	    "0.0.25",
 	    "0.0.27",
-	    "0.0.28"
+	    "0.0.28",
+	    "0.0.29"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 2f1e669..7898c95 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.28",
+      "defaultValue": "0.0.29",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -95,7 +95,8 @@
 	    "0.0.23",
 	    "0.0.25",
 	    "0.0.27",
-	    "0.0.28"
+	    "0.0.28",
+	    "0.0.29"
       ],
       "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 f687cc6..59b67f3 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.32.2",
+            "defaultValue": "3.33.3",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -186,6 +186,10 @@
 		{
 		  "label": "3.32.2",
 		  "value": "0.0.27"
+		},
+		{
+		  "label": "3.33.3",
+		  "value": "0.0.28"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index c5583c3..bb52c5a 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.27",
+      "defaultValue": "0.0.28",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -35,7 +35,8 @@
         "0.0.24",
         "0.0.25",
 	"0.0.26",
-	"0.0.27"
+	"0.0.27",
+	"0.0.28"
       ],
       "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 fbaa10e..9cc5703 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.27"
+      "value": "0.0.28"
     },
     "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 43f7891..16f4873 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.27",
+      "defaultValue": "0.0.28",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -35,7 +35,8 @@
         "0.0.24",
         "0.0.25",
 	"0.0.26",
-	"0.0.27"
+	"0.0.27",
+	"0.0.28"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."