diff --git a/resources/microsoft-pid.properties b/resources/microsoft-pid.properties index 5ec76ad03..ab91a07a4 100644 --- a/resources/microsoft-pid.properties +++ b/resources/microsoft-pid.properties @@ -113,6 +113,10 @@ from.owls-141100-jdk8-ol87=5d011fae-34c1-4004-bd19-c2d2bccd30a4 from.owls-141100-jdk8-ol91=9d76fbe1-3bbc-4a2b-a209-7427ad1db4ab from.owls-141100-jdk11-ol87=459c178d-aec6-4bb5-8e80-66291f0ee6a8 from.owls-141100-jdk11-ol91=5ce9afe5-c458-41b6-9b46-4899cde11806 +from.owls-141200-jdk21-ol94=ce0ed319-7470-4b49-ba87-a3ebcf49b303 +from.owls-141200-jdk21-ol810=2d0a20a6-3022-4142-8f46-6f84af1adc66 +from.owls-141200-jdk17-ol94=d3acf02b-e8f3-41ca-9e62-1318ab0c023b +from.owls-141200-jdk17-ol810=00d54634-1327-46bc-8a05-865aa648733d # Pids to indicate which latest base image was chosen. No difference in these diff --git a/resources/pid.properties b/resources/pid.properties index dcf615e9e..183acf541 100644 --- a/resources/pid.properties +++ b/resources/pid.properties @@ -113,6 +113,11 @@ from.owls-141100-jdk8-ol87=d58854b4-a612-4fbf-b095-f2d2178a88df from.owls-141100-jdk8-ol91=76d4dbe8-0679-4772-ad2e-461fac83dfd7 from.owls-141100-jdk11-ol87=c8f1b07d-1660-4f6a-be97-3925645e8817 from.owls-141100-jdk11-ol91=cd48f178-52a3-415e-88bb-caa45f615b94 +from.owls-141200-jdk21-ol94=6acfc3a0-6225-465f-9fa9-4d63ea81405b +from.owls-141200-jdk21-ol810=69146c30-9c7e-4ce2-8642-eb8eb1b23cc5 +from.owls-141200-jdk17-ol94=a9a1c9b7-6c27-4086-b271-1ffd3c215390 +from.owls-141200-jdk17-ol810=69b6b433-1679-4d37-af25-3d56987c217a + # Pids to indicate which latest base image was chosen. No difference in these # between Oracle and Microsoft diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json index 78665d54a..0b231770b 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json @@ -15,56 +15,60 @@ "name": "skuUrnVersion", "type": "Microsoft.Common.DropDown", "label": "Oracle WebLogic Image", - "defaultValue": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1", + "defaultValue": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9", "toolTip": "Choose Oracle WebLogic image, which is provided by Oracle, with Java and WebLogic preinstalled.", "constraints": { "allowedValues": [ { - "label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1", - "value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest" + "label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9", + "value": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest" }, { - "label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8.7", - "value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest" + "label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 8", + "value": "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest" }, { - "label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9.1", - "value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest" + "label": "WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 9", + "value": "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest" }, { - "label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8.7", - "value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest" + "label": "WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 8", + "value": "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest" }, { - "label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9.1", - "value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest" + "label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9", + "value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest" }, { - "label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8.7", - "value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest" + "label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8", + "value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest" }, { - "label": "WebLogic Server 12.2.1.4.0 and JDK8 on Oracle Linux 7.6", - "value": "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest" + "label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9", + "value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest" }, { - "label": "WebLogic Server 14.1.1.0.0 and JDK8 on Oracle Linux 7.6", - "value": "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest" + "label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8", + "value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest" }, { - "label": "WebLogic Server 14.1.1.0.0 and JDK11 on Oracle Linux 7.6", - "value": "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest" + "label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9", + "value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest" + }, + { + "label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8", + "value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest" }, { - "label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8.7", + "label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8", "value": "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest" }, { - "label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8.7", + "label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8", "value": "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest" }, { - "label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8.7", + "label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8", "value": "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest" } ], @@ -1077,8 +1081,8 @@ "uploadedPrivateKeyAlias": "[steps('section_sslConfiguration').uploadedCustomSSLSettings.uploadedPrivateKeyAlias]", "uploadedPrivateKeyPassPhrase": "[steps('section_sslConfiguration').uploadedCustomSSLSettings.uploadedPrivateKeyPassPhrase]", "virtualNetworkName": "[steps('section_networkingConfiguration').virtualNetwork.name]", - "virtualNetworkResourceGroupName": "[steps('section_networkingConfiguration').virtualNetwork.resourceGroup]", + "virtualNetworkResourceGroupName": "[if(equals(steps('section_networkingConfiguration').virtualNetwork.newOrExisting, 'new'),resourceGroup().name,steps('section_networkingConfiguration').virtualNetwork.resourceGroup)]", "virtualNetworkNewOrExisting": "[steps('section_networkingConfiguration').virtualNetwork.newOrExisting]" } } -} +} \ No newline at end of file diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json index c5bee0ed6..95f587fc5 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json @@ -249,23 +249,21 @@ }, "skuUrnVersion": { "type": "string", - "defaultValue": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest", + "defaultValue": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest", "allowedValues": [ + "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest", + "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest", + "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest", + "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest", "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest", "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest", "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest", "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest", "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest", "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest", - "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest", - "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest", - "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest", "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest", "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest", - "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest", - "owls-122140-jdk8-rhel76;Oracle:weblogic-122140-jdk8-rhel76:owls-122140-jdk8-rhel76;latest", - "owls-141100-jdk8-rhel76;Oracle:weblogic-141100-jdk8-rhel76:owls-141100-jdk8-rhel76;latest", - "owls-141100-jdk11-rhel76;Oracle:weblogic-141100-jdk11-rhel76:owls-141100-jdk11-rhel76;latest" + "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest" ], "metadata": { "description": "The Oracle Linux image with Weblogic and Java preinstalled. Semicolon separated string of Sku, URN, and Version" diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json index a219cdc66..908ffbbf6 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json @@ -109,23 +109,21 @@ }, "skuUrnVersion": { "type": "string", - "defaultValue": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest", + "defaultValue": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest", "allowedValues": [ + "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest", + "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest", + "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest", + "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest", "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest", "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest", "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest", "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest", "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest", "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest", - "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest", - "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest", - "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest", "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest", "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest", - "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest", - "owls-122140-jdk8-rhel76;Oracle:weblogic-122140-jdk8-rhel76:owls-122140-jdk8-rhel76;latest", - "owls-141100-jdk8-rhel76;Oracle:weblogic-141100-jdk8-rhel76:owls-141100-jdk8-rhel76;latest", - "owls-141100-jdk11-rhel76;Oracle:weblogic-141100-jdk11-rhel76:owls-141100-jdk11-rhel76;latest" + "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest" ], "metadata": { "description": "The Oracle Linux image with Weblogic and Java preinstalled. Semicolon separated string of Sku, URN, and Version" @@ -605,9 +603,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol91}", + "name": "${from.owls-141200-jdk21-ol94}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -624,9 +622,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol87}", + "name": "${from.owls-141200-jdk21-ol810}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -639,13 +637,13 @@ ] } } - }, + }, { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol91}", + "name": "${from.owls-141200-jdk17-ol94}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -662,9 +660,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol87}", + "name": "${from.owls-141200-jdk17-ol810}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -681,9 +679,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol91}", + "name": "${from.owls-141100-jdk11-ol91}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -700,9 +698,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol87}", + "name": "${from.owls-141100-jdk11-ol87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -715,13 +713,13 @@ ] } } - }, + }, { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol76}", + "name": "${from.owls-141100-jdk8-ol91}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -738,9 +736,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol76}", + "name": "${from.owls-141100-jdk8-ol87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -757,9 +755,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol76}", + "name": "${from.owls-122140-jdk8-ol91}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -776,9 +774,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel87}", + "name": "${from.owls-122140-jdk8-ol87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -791,13 +789,13 @@ ] } } - }, + }, { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel87}", + "name": "${from.owls-141100-jdk11-rhel87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -814,9 +812,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel76}", + "name": "${from.owls-122140-jdk8-rhel87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -848,45 +846,7 @@ ] } } - }, - { - "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel76}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", - "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" - ], - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - ] - } - } - }, - { - "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel76}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", - "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" - ], - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - ] - } - } - } + } ], "outputs": { "_adminPublicIPId": { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json index a8800c2b2..4b7c0e0f4 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json @@ -166,23 +166,21 @@ }, "skuUrnVersion": { "type": "string", - "defaultValue": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest", + "defaultValue": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest", "allowedValues": [ + "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest", + "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest", + "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest", + "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest", "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest", "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest", "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest", "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest", "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest", "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest", - "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest", - "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest", - "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest", "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest", "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest", - "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest", - "owls-122140-jdk8-rhel76;Oracle:weblogic-122140-jdk8-rhel76:owls-122140-jdk8-rhel76;latest", - "owls-141100-jdk8-rhel76;Oracle:weblogic-141100-jdk8-rhel76:owls-141100-jdk8-rhel76;latest", - "owls-141100-jdk11-rhel76;Oracle:weblogic-141100-jdk11-rhel76:owls-141100-jdk11-rhel76;latest" + "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest" ], "metadata": { "description": "The Oracle Linux image with Weblogic and Java preinstalled. Semicolon separated string of Sku, URN, and Version" @@ -693,9 +691,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol91}", + "name": "${from.owls-141200-jdk21-ol94}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -712,9 +710,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol87}", + "name": "${from.owls-141200-jdk21-ol810}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -727,13 +725,13 @@ ] } } - }, + }, { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol91}", + "name": "${from.owls-141200-jdk17-ol94}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -750,9 +748,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol87}", + "name": "${from.owls-141200-jdk17-ol810}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -769,9 +767,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol91}", + "name": "${from.owls-141100-jdk11-ol91}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -788,9 +786,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol87}", + "name": "${from.owls-141100-jdk11-ol87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -803,13 +801,13 @@ ] } } - }, + }, { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-ol76}", + "name": "${from.owls-141100-jdk8-ol91}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -826,9 +824,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-ol76}", + "name": "${from.owls-141100-jdk8-ol87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -845,9 +843,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-ol76}", + "name": "${from.owls-122140-jdk8-ol91}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -864,9 +862,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel87}", + "name": "${from.owls-122140-jdk8-ol87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -883,47 +881,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", - "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" - ], - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - ] - } - } - }, - { - "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel87}", - "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", - "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" - ], - "properties": { - "mode": "Incremental", - "template": { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "resources": [ - ] - } - } - }, - { - "type": "Microsoft.Resources/deployments", - "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-122140-jdk8-rhel76}", + "name": "${from.owls-141100-jdk11-rhel87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -936,13 +896,13 @@ ] } } - }, + }, { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk8-rhel76}", + "name": "${from.owls-141100-jdk8-rhel87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -959,9 +919,9 @@ { "type": "Microsoft.Resources/deployments", "apiVersion": "${azure.apiVersionForDeployment}", - "name": "${from.owls-141100-jdk11-rhel76}", + "name": "${from.owls-122140-jdk8-rhel87}", "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]", - "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", + "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ "[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]" ], @@ -974,7 +934,7 @@ ] } } - } + } ], "outputs": { "_adminPublicIPId": { diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/resources/marketing-artifacts/partner-center.html b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/resources/marketing-artifacts/partner-center.html index c27730901..ac5f8d0b8 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/resources/marketing-artifacts/partner-center.html +++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/resources/marketing-artifacts/partner-center.html @@ -9,7 +9,7 @@

Description

across the globe. This solution automates most boilerplate steps to provision a single WLS Admin Server on an Azure VM. Once initial provisioning is complete, you are completely free to customize deployments further. The solution is jointly developed by Oracle and Microsoft.

-

WLS Enterprise Edition versions supported include 12.2.1.4, and 14.1.1.0.

+

WLS Enterprise Edition versions supported include 12.2.1.4, 14.1.1.0 and 14.1.2.0 .

The following resources are automatically provisioned by the offer.