From a4efffcd6ccca65cec562f54a3bc6b48cc12a71e Mon Sep 17 00:00:00 2001
From: anupteal <anup.singh@igtsolutions.com>
Date: Wed, 27 Oct 2021 21:42:34 +0530
Subject: [PATCH] updated all changes for artifactory 7.27.6 & xray 3.34.1

---
 .../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_vmss.json        | 4 ++--
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index 9870c59..65aec99 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.27.3",
+            "defaultValue": "7.27.6",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -199,6 +199,10 @@
 		{
 		  "label": "7.27.3",
 		  "value": "0.0.29"
+		},
+		{
+		  "label": "7.27.6",
+		  "value": "0.0.30"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 52108c8..649b325 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.29",
+      "defaultValue": "0.0.30",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -96,7 +96,8 @@
 	    "0.0.25",
 	    "0.0.27",
 	    "0.0.28",
-	    "0.0.29"
+	    "0.0.29",
+	    "0.0.30"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 7898c95..f18500f 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.29",
+      "defaultValue": "0.0.30",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -96,7 +96,8 @@
 	    "0.0.25",
 	    "0.0.27",
 	    "0.0.28",
-	    "0.0.29"
+	    "0.0.29",
+	    "0.0.30"
       ],
       "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 59b67f3..ba8a398 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.33.3",
+            "defaultValue": "3.34.1",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -190,6 +190,10 @@
 		{
 		  "label": "3.33.3",
 		  "value": "0.0.28"
+		},
+		{
+		  "label": "3.34.1",
+		  "value": "0.0.29"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index bb52c5a..20b74ad 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.28",
+      "defaultValue": "0.0.29",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -36,7 +36,8 @@
         "0.0.25",
 	"0.0.26",
 	"0.0.27",
-	"0.0.28"
+	"0.0.28",
+	"0.0.29"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
index f7e99ee..6df01df 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -205,7 +205,7 @@
     "joinKey": "[parameters('joinKey')]",
     "osType": {
       "publisher": "jfrog",
-      "offer": "x-ray-vm-preview",
+      "offer": "x-ray-vm",
       "sku": "x-ray-vm",
       "version": "[parameters('xrayVersion')]"
     },
@@ -341,7 +341,7 @@
       "plan": {
         "name": "x-ray-vm",
         "publisher": "jfrog",
-        "product": "x-ray-vm-preview"
+        "product": "x-ray-vm"
       },
       "sku": {
         "name": "[parameters('virtualMachineSize')]",