8000 Merge pull request #333 from azure-javaee/edburns-msft-dd-2321245-emp… · azure-javaee/weblogic-azure@465bd59 · GitHub
[go: up one dir, main page]
Skip to content

Commit 465bd59

Browse files
rjeberhardrjeberhard
authored
Merge pull request oracle#333 from azure-javaee/edburns-msft-dd-2321245-empty-resource-group
On branch edburns-msft-dd-2321245-empty-resource-group apply the "allowExisting" property.
2 parents 1e4dea3 + 4392641 commit 465bd59

File tree

8 files changed

+41
-6
lines changed

8 files changed

+41
-6
lines changed

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
<!-- weblogic azure aks versions -->
4343
<version.wls-on-aks-azure-marketplace>1.0.86</version.wls-on-aks-azure-marketplace>
4444
<!-- weblogic azure vm versions -->
45-
<version.arm-oraclelinux-wls>1.0.29</version.arm-oraclelinux-wls>
46-
<version.arm-oraclelinux-wls-admin>1.0.54</version.arm-oraclelinux-wls-admin>
47-
<version.arm-oraclelinux-wls-cluster>1.0.700000</version.arm-oraclelinux-wls-cluster>
48-
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.52</version.arm-oraclelinux-wls-dynamic-cluster>
45+
<version.arm-oraclelinux-wls>1.0.30</version.arm-oraclelinux-wls>
46+
<version.arm-oraclelinux-wls-admin>1.0.55</version.arm-oraclelinux-wls-admin>
47+
<version.arm-oraclelinux-wls-cluster>1.0.710000</version.arm-oraclelinux-wls-cluster>
48+
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>
4949
<!-- node versions -->
5050
<version.arm-oraclelinux-wls-dynamic-cluster-addnode>1.0.7</version.arm-oraclelinux-wls-dynamic-cluster-addnode>
5151
<version.arm-oraclelinux-wls-dynamic-cluster-addnode-coherence>1.0.3</version.arm-oraclelinux-wls-dynamic-cluster-addnode-coherence>

‎weblogic-azure-aks/src/main/arm/createUiDefinition.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
"handler": "Microsoft.Azure.CreateUIDef",
44
"version": "0.1.2-preview",
55
"parameters": {
6+
"config": {
7+
"basics": {
8+
"resourceGroup": {
9+
"allowExisting": true
10+
}
11+
}
12+
},
613
"basics": [
714
{
815
"name": "infoForBeforeDeployment",

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/createUiDefinition.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
"handler": "Microsoft.Azure.CreateUIDef",
44
"version": "0.1.2-preview",
55
"parameters": {
6+
"config": {
7+
"basics": {
8+
"resourceGroup": {
9+
"allowExisting": true
10+
}
11+
}
12+
},
613
"basics": [
714
{
815
"name": "skuUrnVersion",

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-services.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2021, Oracle and/or its affiliates.
2+
# Copyright (c) 2024, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
# Verify the service using systemctl status

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/test/scripts/verify-wls-path.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bas D7AE h
2-
# Copyright (c) 2021, Oracle and/or its affiliates.
2+
# Copyright (c) 2024, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
echo "#adminPasswordOrKey#" | sudo -S [ -d "/u01/app/wls/install/oracle/middleware/oracle_home/wlserver/modules" ] && exit 0

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
"handler": "Microsoft.Azure.CreateUIDef",
44
"version": "0.1.2-preview",
55
"parameters": {
6+
"config": {
7+
"basics": {
8+
"resourceGroup": {
9+
"allowExisting": true
10+
}
11+
}
12+
},
613
"basics": [
714
{
815
"name": "skuUrnVersion",

‎weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/arm/createUiDefinition.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
"handler": "Microsoft.Azure.CreateUIDef",
44
"version": "0.1.2-preview",
55
"parameters": {
6+
"config": {
7+
"basics": {
8+
"resourceGroup": {
9+
"allowExisting": true
10+
}
11+
}
12+
},
613
"basics": [
714
{
815
"name": "skuUrnVersion",

‎weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/createUiDefinition.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
"handler": "Microsoft.Azure.CreateUIDef",
44
"version": "0.1.2-preview",
55
"parameters": {
6+
"config": {
7+
"basics": {
8+
"resourceGroup": {
9+
"allowExisting": true
10+
}
11+
}
12+
},
613
"basics": [
714
{
815
"name": "skuUrnVersion",

0 commit comments

Comments
 (0)
0