ARM template, Artifactory 7.15.4, Xray 3.18.0 (#93)

* updated

* updated artifactory releas version 7.15.4 in createUiDefinition.json & mainTemplate.json file

* updated version 7.15.4 in createUiDefinition.json file

* updated version 7.15.4 in mainTemplate.json file

* ARM templates. pid removed from all the templates per new MS requirements. RT 7.15.4, Xray 3.17.4, JSON docs aligned

* updated all changes for artifactory version 7.15.4 & x-ray version 3.18.0

Co-authored-by: danielmkn <danielmi@jfrog.com>

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.15.3",
+            "defaultValue": "7.15.4",
             "toolTip": "Version of Artifactory to deploy",
             "constraints": {
               "allowedValues": [
@@ -151,6 +151,10 @@
 	        {
                   "label": "7.15.3",
 	          "value": "0.0.11"
+	        },
+	        {
+                  "label": "7.15.4",
+                  "value": "0.0.12"
                 }
               ],
               "required": true

AzureResourceManager/Artifactory/MP_submission/mainTemplate.json

@@ -79,12 +79,13 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.11",
+      "defaultValue": "0.0.12",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
 	    "0.0.10",
-	    "0.0.11"
+	    "0.0.11",
+	    "0.0.12"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
@@ -305,19 +306,6 @@
     "nsgName": "[concat(variables('namingInfix'), 'nsg')]"
   },
   "resources": [
-    {
-      "apiVersion": "2019-05-01",
-      "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": []
-        }
-      }
-    },
     {
       "type": "Microsoft.Network/networkSecurityGroups",
       "location": "[parameters('location')]",

AzureResourceManager/Artifactory/azuredeploy.json

@@ -79,12 +79,13 @@
     },
     "artifactoryVersion": {
       "type": "string",
-      "defaultValue": "0.0.11",
+      "defaultValue": "0.0.12",
       "allowedValues": [
 	    "0.0.8",
             "0.0.9",
 	    "0.0.10",
-	    "0.0.11"
+	    "0.0.11",
+	    "0.0.12"
       ],
       "metadata": {
         "description": "Artifactory-vm image version to deploy."
@@ -305,19 +306,6 @@
     "nsgName": "[concat(variables('namingInfix'), 'nsg')]"
   },
   "resources": [
-    {
-      "apiVersion": "2019-05-01",
-      "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": []
-        }
-      }
-    },
     {
       "type": "Microsoft.Network/networkSecurityGroups",
       "location": "[parameters('location')]",

AzureResourceManager/Artifactory/vm_install/vm_parameters.json

@@ -90,7 +90,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "artifactoryVersion": {
-            "value": "7.15.3"
+            "value": "7.15.4"
         },
         "scriptName": {
             "value": "install_pro7_to_vm.sh"

AzureResourceManager/JCR/MP_submission_7/mainTemplate.json

@@ -202,19 +202,6 @@
     "nsgName": "[concat(variables('namingInfix'), 'nsg')]"
   },
   "resources": [
-    {
-      "apiVersion": "2019-05-01",
-      "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": []
-        }
-      }
-    },
     {
       "type": "Microsoft.Network/networkSecurityGroups",
       "location": "[parameters('location')]",

AzureResourceManager/JCR/azuredeploy.json

@@ -203,19 +203,6 @@
     "nsgName": "[concat(variables('namingInfix'), 'nsg')]"
   },
   "resources": [
-    {
-      "apiVersion": "2019-05-01",
-      "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": []
-        }
-      }
-    },
     {
       "type": "Microsoft.Network/networkSecurityGroups",
       "location": "[parameters('location')]",

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.17.4",
+            "defaultValue": "3.18.0",
             "toolTip": "Version of Xray to deploy",
             "constraints": {
               "allowedValues": [
@@ -142,6 +142,10 @@
 	        {
                   "label": "3.17.4",
 	          "value": "0.0.14"
+	        },
+		{
+		  "label": "3.18.0",
+		  "value": "0.0.15"
 		}
               ],
               "required": true

AzureResourceManager/Xray/MP_submission/mainTemplate.json

@@ -19,12 +19,13 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.14",
+      "defaultValue": "0.0.15",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
         "0.0.13",
-	"0.0.14"
+        "0.0.14",
+	"0.0.15"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
@@ -202,19 +203,6 @@
     "artifactoryURL": "[parameters('artifactoryURL')]"
   },
   "resources": [
-    {
-      "apiVersion": "2019-05-01",
-      "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": []
-        }
-      }
-    },
     {
       "condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]",
       "type": "Microsoft.Network/virtualNetworks",

AzureResourceManager/Xray/azuredeploy_xray.parameters.json

@@ -33,7 +33,7 @@
       "value": "10.0.1.0/24"
     },
     "xrayVersion": {
-      "value": "0.0.13"
+      "value": "0.0.15"
     },
     "artifactoryURL": {
       "value": "http://ARTIFACTORY-URL.cloudapp.azure.com"

AzureResourceManager/Xray/azuredeploy_xray_vmss.json

@@ -19,12 +19,13 @@
     },
     "xrayVersion": {
       "type": "string",
-      "defaultValue": "0.0.14",
+      "defaultValue": "0.0.15",
       "allowedValues": [
         "0.0.10",
         "0.0.11",
 	"0.0.13",
-	"0.0.14"
+	"0.0.14",
+	"0.0.15"
       ],
       "metadata": {
         "description": "Xray-vm image version to deploy."
@@ -202,19 +203,6 @@
     "artifactoryURL": "[parameters('artifactoryURL')]"
   },
   "resources": [
-    {
-      "apiVersion": "2019-05-01",
-      "name": "pid-04c1c376-5d4b-4771-9a7f-054f5910dcef",
-      "type": "Microsoft.Resources/deployments",
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": []
-        }
-      }
-    },
     {
       "condition": "[equals(parameters('virtualNetworkNewOrExisting'),'new')]",
       "type": "Microsoft.Network/virtualNetworks",

AzureResourceManager/Xray/vm_install/vm_parameters.json

@@ -90,7 +90,7 @@
             "value": "OWERWRITE_THE_PASSWORD"
         },
         "xrayVersion": {
-            "value": "3.17.4"
+            "value": "3.18.0"
         },
         "scriptName": {
             "value": "install_xray_to_vm.sh"