From 550b78b18dd99fb7fc27c65698cb0e1a54ad8ea3 Mon Sep 17 00:00:00 2001
From: brucec <brucec@jfrog.com>
Date: Mon, 25 Mar 2019 12:06:40 -0700
Subject: [PATCH] Updated proper json for installers and version update for CF
 and TF

---
 AzureResourceManager/scripts/install_artifactory.sh | 3 +--
 CloudFormation/artifactory-enterprise.json          | 7 +++++--
 Terraform/userdata.sh                               | 3 +--
 Terraform/variables.tf                              | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/AzureResourceManager/scripts/install_artifactory.sh b/AzureResourceManager/scripts/install_artifactory.sh
index 54f0e7e..3fc0b91 100644
--- a/AzureResourceManager/scripts/install_artifactory.sh
+++ b/AzureResourceManager/scripts/install_artifactory.sh
@@ -217,8 +217,7 @@ cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
   "productId": "JFrogInstaller_Azure_SQL/1.0.0"
   "features": [
   {
-    "featureId": "Artifactory/${artifactoryVersion}",
-    "attributes": {}
+    "featureId": "Artifactory/${artifactoryVersion}"
   }
 }
 EOF
diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json
index 63ce4ab..80e5fa3 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.2.0"
+      "Default": "6.9.0"
     },
 
     "ArtifactoryLicense1": {
@@ -910,7 +910,6 @@
                   "  \"features\": [\n",
                   "  {\n",
                   "    \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
-                  "    \"attributes\": {}\n",
                   "  }\n",
                   "}\n"
                 ]]},
@@ -1274,6 +1273,10 @@
                 "content" : { "Fn::Join" : ["", [
                   "{\n",
                   "  \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n",
+                  "  \"features\": [\n",
+                  "  {\n",
+                  "    \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
+                  "  }\n",
                   "}\n"
                 ]]},
                 "mode"   : "000755",
diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh
index af016b1..551064f 100644
--- a/Terraform/userdata.sh
+++ b/Terraform/userdata.sh
@@ -178,8 +178,7 @@ cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
   "productId": "JFrog_TerraformInstaller_Mysql/1.0.0"
   "features": [
   {
-    "featureId": "Artifactory/${artifactory_version}",
-    "attributes": {}
+    "featureId": "Artifactory/${artifactory_version}"
   }
 }
 EOF
diff --git a/Terraform/variables.tf b/Terraform/variables.tf
index 42bd81b..13c460d 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.2.0"
+  default     = "6.9.0"
 }
 
 variable "artifactory_license_1" {