From 8766a0cf0c847be4a2fc3506f344fc58a0c4ca31 Mon Sep 17 00:00:00 2001
From: anupteal <anup.singh@igtsolutions.com>
Date: Tue, 30 Nov 2021 21:32:29 +0530
Subject: [PATCH] updated all changes for artifactory 7.27.9 & xray 3.35.0

---
 .../Artifactory/MP_submission/createUiDefinition.json |  6 +++++-
 .../Artifactory/MP_submission/mainTemplate.json       |  5 +++--
 AzureResourceManager/Artifactory/azuredeploy.json     | 11 ++++++-----
 .../Xray/MP_submission/createUiDefinition.json        |  6 +++++-
 .../Xray/MP_submission/mainTemplate.json              |  5 +++--
 AzureResourceManager/Xray/azuredeploy_xray_vmss.json  |  4 ++--
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index 65aec99..b4ce7dd 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.6",
+            "defaultValue": "7.27.9",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -203,6 +203,10 @@
 		{
 		  "label": "7.27.6",
 		  "value": "0.0.30"
+		},
+		{
+		  "label": "7.27.9",
+		  "value": "0.0.32"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 649b325..377543d 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.30",
+      "defaultValue": "0.0.32",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -97,7 +97,8 @@
 	    "0.0.27",
 	    "0.0.28",
 	    "0.0.29",
-	    "0.0.30"
+	    "0.0.30",
+	    "0.0.32"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 4481b94..923bf17 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.30",
+      "defaultValue": "0.0.32",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
@@ -97,7 +97,8 @@
 	    "0.0.27",
 	    "0.0.28",
 	    "0.0.29",
-	    "0.0.30"
+	    "0.0.30",
+	    "0.0.32"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
@@ -308,7 +309,7 @@
     "artifactoryLicense5": "[parameters('artifactoryLicense5')]",
     "osType": {
       "publisher": "jfrog",
-      "offer": "artifactory-vm-preview",
+      "offer": "artifactory-vm",
       "sku": "artifactory-vm",
       "version": "[parameters('artifactoryVersion')]"
     },
@@ -776,7 +777,7 @@
       "plan": {
         "name": "artifactory-vm",
         "publisher": "jfrog",
-        "product": "artifactory-vm-preview"
+        "product": "artifactory-vm"
       },
       "sku": {
         "name": "[parameters('vmSku')]",
@@ -873,7 +874,7 @@
       "plan": {
         "name": "artifactory-vm",
         "publisher": "jfrog",
-        "product": "artifactory-vm-preview"
+        "product": "artifactory-vm"
       },
       "sku": {
         "name": "[parameters('vmSku')]",
diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json
index ba8a398..d49c723 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.34.1",
+            "defaultValue": "3.35.0",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -194,6 +194,10 @@
 		{
 		  "label": "3.34.1",
 		  "value": "0.0.29"
+		},
+		{
+		  "label": "3.35.0",
+		  "value": "0.0.30"
 		}
               ],
               "required": true
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index 20b74ad..93d36f2 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.29",
+      "defaultValue": "0.0.30",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -37,7 +37,8 @@
 	"0.0.26",
 	"0.0.27",
 	"0.0.28",
-	"0.0.29"
+	"0.0.29",
+	"0.0.30"
       ],
       "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 eefd208..dfff8f0 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -206,7 +206,7 @@
     "joinKey": "[parameters('joinKey')]",
     "osType": {
       "publisher": "jfrog",
-      "offer": "x-ray-vm-preview",
+      "offer": "x-ray-vm",
       "sku": "x-ray-vm",
       "version": "[parameters('xrayVersion')]"
     },
@@ -342,7 +342,7 @@
       "plan": {
         "name": "x-ray-vm",
         "publisher": "jfrog",
-        "product": "x-ray-vm-preview"
+        "product": "x-ray-vm"
       },
       "sku": {
         "name": "[parameters('virtualMachineSize')]",