From c97822ca8d7dfbcfac9c3a08079c0dce49cd27a8 Mon Sep 17 00:00:00 2001
From: logeshwarsn <logeshwars@jfrog.com>
Date: Wed, 23 Nov 2022 13:01:48 +0530
Subject: [PATCH] INST-5035 - Changes in Artifactory version and set hide
 confiramation to false

---
 .../Artifactory/MP_submission/createUiDefinition.json  | 10 +++++++---
 .../Artifactory/MP_submission/mainTemplate.json        |  7 ++++---
 AzureResourceManager/Artifactory/azuredeploy.json      |  6 ++++--
 .../Xray/MP_submission/createUiDefinition.json         | 10 +++++++---
 .../Xray/MP_submission/mainTemplate.json               |  5 +++--
 AzureResourceManager/Xray/azuredeploy_xray_vmss.json   |  6 ++++--
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json
index e9e8a83..4ed1777 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.41.7",
+            "defaultValue": "7.46.11",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -239,6 +239,10 @@
                 {
                   "label": "7.41.7",
                   "value": "0.0.41"
+                },
+                {
+                  "label": "7.46.11",
+                  "value": "0.0.42"
                 }
               ],
               "required": true
@@ -259,7 +263,7 @@
               "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
             },
             "options": {
-              "hideConfirmation": true
+              "hideConfirmation": false
             }
           },
           {
@@ -276,7 +280,7 @@
               "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
             },
             "options": {
-              "hideConfirmation": true
+              "hideConfirmation": false
             }
           },
           {
diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json
index 696188e..1317af0 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.41",
+      "defaultValue": "0.0.42",
       "allowedValues": [
         "0.0.8",
         "0.0.9",
@@ -106,7 +106,8 @@
         "0.0.38",
         "0.0.39",
         "0.0.40",
-        "0.0.41"
+        "0.0.41",
+        "0.0.42"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
@@ -328,7 +329,7 @@
   },
   "resources": [
     {
-      "apiVersion": "2021-12-01",
+      "apiVersion": "2021-04-01",
       "name": "pid-9cc90849-b021-4272-a33f-1922bd5c0f99-partnercenter",
       "type": "Microsoft.Resources/deployments",
       "properties": {
diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json
index 5cf92e3..a72ae0a 100644
--- a/AzureResourceManager/Artifactory/azuredeploy.json
+++ b/AzureResourceManager/Artifactory/azuredeploy.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.40",
+      "defaultValue": "0.0.42",
       "allowedValues": [
         "0.0.8",
         "0.0.9",
@@ -105,7 +105,9 @@
         "0.0.37",
         "0.0.38",
         "0.0.39",
-        "0.0.40"
+        "0.0.40",
+        "0.0.41",
+        "0.0.42"
       ],
       "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 645a48c..1d6965d 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.55.2",
+            "defaultValue": "3.60.2",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -218,6 +218,10 @@
                 {
                   "label": "3.55.2",
                   "value": "0.0.35"
+                },
+                {
+                  "label": "3.60.2",
+                  "value": "0.0.36"
                 }
               ],
               "required": true
@@ -238,7 +242,7 @@
               "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
             },
             "options": {
-              "hideConfirmation": true
+              "hideConfirmation": false
             }
           },
           {
@@ -255,7 +259,7 @@
               "validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-64 characters long."
             },
             "options": {
-              "hideConfirmation": true
+              "hideConfirmation": false
             }
           },
           {
diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json
index bd3f9ee..6230125 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.35",
+      "defaultValue": "0.0.36",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -43,7 +43,8 @@
         "0.0.32",
         "0.0.33",
         "0.0.34",
-        "0.0.35"
+        "0.0.35",
+        "0.0.36"
       ],
       "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 15ef84b..97ad3f0 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.34",
+      "defaultValue": "0.0.36",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
@@ -42,7 +42,9 @@
         "0.0.31",
         "0.0.32",
         "0.0.33",
-        "0.0.34"
+        "0.0.34",
+        "0.0.35",
+        "0.0.36"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."