From bdfda34f5d517e5a53ea710182b186357127c083 Mon Sep 17 00:00:00 2001
From: maheshg <maheshg@jfrog.com>
Date: Mon, 2 Jul 2018 11:05:50 -0700
Subject: [PATCH] Updated Artifactory version to 6.1.0

---
 AzureResourceManager/azuredeploy.json            | 2 +-
 AzureResourceManager/azuredeploy.parameters.json | 2 +-
 CloudFormation/artifactory-enterprise.json       | 2 +-
 Terraform/variables.tf                           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/AzureResourceManager/azuredeploy.json b/AzureResourceManager/azuredeploy.json
index 48551ab..9fabf8e 100644
--- a/AzureResourceManager/azuredeploy.json
+++ b/AzureResourceManager/azuredeploy.json
@@ -27,7 +27,7 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "6.0.2",
+      "defaultValue": "6.1.0",
       "metadata": {
         "description": "Artifactory version to deploy. Supported from 5.8.0 and above."
       }
diff --git a/AzureResourceManager/azuredeploy.parameters.json b/AzureResourceManager/azuredeploy.parameters.json
index 9a4969d..1e6d810 100644
--- a/AzureResourceManager/azuredeploy.parameters.json
+++ b/AzureResourceManager/azuredeploy.parameters.json
@@ -18,7 +18,7 @@
       "value": "GEN-PASSWORD"
     },
     "artifactoryVersion": {
-      "value": "6.0.2"
+      "value": "6.1.0"
     },
     "masterKey": {
       "value": "35767fa0164bac66b6cccb8880babefb"
diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json
index 6d28147..c73d64d 100644
--- a/CloudFormation/artifactory-enterprise.json
+++ b/CloudFormation/artifactory-enterprise.json
@@ -54,7 +54,7 @@
     "ArtifactoryVersion": {
       "Description": "Artifactory version to deploy",
       "Type": "String",
-      "Default": "6.0.2"
+      "Default": "6.1.0"
     },
 
     "ArtifactoryLicense1": {
diff --git a/Terraform/variables.tf b/Terraform/variables.tf
index 7e5ade3..ade25c5 100644
--- a/Terraform/variables.tf
+++ b/Terraform/variables.tf
@@ -9,7 +9,7 @@ variable "key_name" {
 
 variable "artifactory_version" {
   description = "Artifactory version to deploy"
-  default     = "6.0.2"
+  default     = "6.1.0"
 }
 
 variable "artifactory_license_1" {