From 0ebf6e8ad8d06da2e0befa56dec768a8012ec478 Mon Sep 17 00:00:00 2001
From: Anup Singh <64248163+anupteal@users.noreply.github.com>
Date: Mon, 7 Dec 2020 23:38:00 +0530
Subject: [PATCH] Arm 7.11.5 (#71)

* Updated artifactory  & Jcr version 7.11.5 and xray version 3.12.0 in configurations files

* Update azuredeploy_xray_vmss.json

* Update azuredeploy_ms_ps.json

* Update azuredeploy.json
---
 AzureResourceManager/Artifactory/azuredeploy_ms_ps.json    | 7 ++++---
 .../Artifactory/vm_install/vm_parameters.json              | 2 +-
 AzureResourceManager/JCR/azuredeploy.json                  | 7 ++++---
 AzureResourceManager/JCR/vm_install/vm_parameters.json     | 2 +-
 AzureResourceManager/Xray/azuredeploy_xray_vmss.json       | 5 +++--
 AzureResourceManager/Xray/vm_install/vm_parameters.json    | 2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json
index 9b707c5..fb619e3 100644
--- a/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json
+++ b/AzureResourceManager/Artifactory/azuredeploy_ms_ps.json
@@ -79,7 +79,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.6",
+      "defaultValue": "0.0.7",
       "allowedValues": [
         "6.11.3",
         "6.15.0",
@@ -95,8 +95,9 @@
         "0.0.2",
         "0.0.31",
         "0.0.4",
-	    "0.0.52",
-	    "0.0.6"
+	"0.0.52",
+	"0.0.6",
+        "0.0.7"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
diff --git a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json
index d8c4b27..3699c89 100644
--- a/AzureResourceManager/Artifactory/vm_install/vm_parameters.json
+++ b/AzureResourceManager/Artifactory/vm_install/vm_parameters.json
@@ -90,7 +90,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "artifactoryVersion": {
-            "value": "7.11.2"
+            "value": "7.11.5"
         },
         "scriptName": {
             "value": "install_pro7_to_vm.sh"
diff --git a/AzureResourceManager/JCR/azuredeploy.json b/AzureResourceManager/JCR/azuredeploy.json
index aa4a791..bab9aee 100644
--- a/AzureResourceManager/JCR/azuredeploy.json
+++ b/AzureResourceManager/JCR/azuredeploy.json
@@ -25,7 +25,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.61",
+      "defaultValue": "0.0.7",
       "allowedValues": [
         "7.2.1",
         "7.3.2",
@@ -33,8 +33,9 @@
         "0.0.2",
         "0.0.3",
         "0.0.4",
-	    "0.0.5",
-	    "0.0.61"
+	"0.0.5",
+	"0.0.61",
+        "0.0.7"
       ],
       "metadata": {
         "description": "JFrog Container Registry-vm image version to deploy."
diff --git a/AzureResourceManager/JCR/vm_install/vm_parameters.json b/AzureResourceManager/JCR/vm_install/vm_parameters.json
index 0d4b2b0..a94297b 100644
--- a/AzureResourceManager/JCR/vm_install/vm_parameters.json
+++ b/AzureResourceManager/JCR/vm_install/vm_parameters.json
@@ -81,7 +81,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "artifactoryVersion": {
-            "value": "7.11.2"
+            "value": "7.11.5"
         },
         "scriptName": {
             "value": "install_jcr7_to_vm.sh"
diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
index 0b72892..1874143 100644
--- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
+++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json
@@ -19,14 +19,15 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.8",
+      "defaultValue": "0.0.9",
       "allowedValues": [
         "0.0.3",
         "0.0.4",
         "0.0.5",
         "0.0.6",
         "0.0.7",
-	"0.0.8"
+	"0.0.8",
+        "0.0.9"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
diff --git a/AzureResourceManager/Xray/vm_install/vm_parameters.json b/AzureResourceManager/Xray/vm_install/vm_parameters.json
index 1527241..cb3b111 100644
--- a/AzureResourceManager/Xray/vm_install/vm_parameters.json
+++ b/AzureResourceManager/Xray/vm_install/vm_parameters.json
@@ -90,7 +90,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "xrayVersion": {
-            "value": "3.11.2"
+            "value": "3.12.0"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"