Skip to content

Commit 5d406f6

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'alias-updates-20251617' into 'main'
Update aliases for future WLS versions: all but problem cases See merge request weblogic-cloud/weblogic-deploy-tooling!1809
2 parents 881bb57 + f08a506 commit 5d406f6

20 files changed

+394
-126
lines changed

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,10 @@
326326
"PersistenceTrashDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceTrashDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
327327
"ReportGroupFile": [ {"version": "[12.1.3,12.2.1)", "wlst_mode": "both", "wlst_name": "ReportGroupFile", "wlst_path": "WP001", "default_value": "em/coherence/report-group.xml", "wlst_type": "string", "uses_path_tokens": "true" },
328328
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ReportGroupFile", "wlst_path": "WP001", "default_value": "em/metadata/reports/coherence/report-group.xml", "wlst_type": "string", "uses_path_tokens": "true" }],
329-
"SourcePath": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ],
329+
"SourcePath": [
330+
{"version": "[12.1.2,15.1.1)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" },
331+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "derived_default": true, "wlst_type": "string", "uses_path_tokens": "true" }
332+
],
330333
"Target": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
331334
{"version": "[12.1.2,12.2.1.1)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean", "derived_default": true},
332335
{"version": "[12.2.1.1,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/CustomResource.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2024, Oracle and/or its affiliates.",
2+
"copyright": "Copyright (c) 2024, 2025, Oracle and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "CustomResource${:s}",
55
"online_bean": "weblogic.management.configuration.CustomResourceMBean",
@@ -34,7 +34,10 @@
3434
"Notes": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
3535
"PartitionName": [ { "version": "[12.2.1,)", "wlst_mode": "online", "wlst_name": "PartitionName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],
3636
"ResourceClass": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "ResourceClass", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
37-
"SourcePath": [ { "version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": "${:true}" } ],
37+
"SourcePath": [
38+
{ "version": "[10,15.1.1)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": "${:true}" },
39+
{ "version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": true, "derived_default": true }
40+
],
3841
"Target": [ { "version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
3942
{ "version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "derived_default": true, "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
4043
},

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/FileStore.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.",
2+
"copyright": "Copyright (c) 2017, 2025, Oracle and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "FileStore${:s}",
55
"online_bean": "weblogic.management.configuration.FileStoreMBean",
@@ -29,8 +29,11 @@
2929
"PartialClusterStabilityDelaySeconds": [ {"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both", "wlst_name": "PartialClusterStabilityDelaySeconds", "wlst_path": "WP001", "default_value": -1, "wlst_type": "long" },
3030
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PartialClusterStabilityDelaySeconds", "wlst_path": "WP001", "default_value": 240, "wlst_type": "long" } ],
3131
"RebalanceEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "RebalanceEnabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
32-
"RestartInPlace": [ {"version": "[12.2.1,12.2.1.2)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ,
33-
{"version": "[12.2.1.2,)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean" } ],
32+
"RestartInPlace": [
33+
{"version": "[12.2.1,12.2.1.2)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ,
34+
{"version": "[12.2.1.2,15.1.1)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean" },
35+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "false", "derived_default": true, "wlst_type": "boolean" }
36+
],
3437
"SecondsBetweenRestarts": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "SecondsBetweenRestarts", "wlst_path": "WP001", "default_value": 30, "wlst_type": "integer" } ],
3538
"SynchronousWritePolicy": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SynchronousWritePolicy", "wlst_path": "WP001", "default_value": "${__NULL__:Direct-Write}", "wlst_type": "string" } ],
3639
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JDBCStore.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2023, Oracle and/or its affiliates.",
2+
"copyright": "Copyright (c) 2017, 2025, Oracle and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "JDBCStore${:s}",
55
"online_bean": "weblogic.management.configuration.JDBCStoreMBean",
@@ -31,8 +31,11 @@
3131
"RebalanceEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "RebalanceEnabled", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
3232
"ReconnectRetryIntervalMillis": [ {"version": "[12.2,)", "wlst_mode": "both", "wlst_name": "ReconnectRetryIntervalMillis", "wlst_path": "WP001", "default_value": 200, "wlst_type": "integer", "restart_required": "true" } ],
3333
"ReconnectRetryPeriodMillis": [ {"version": "[12.2,)", "wlst_mode": "both", "wlst_name": "ReconnectRetryPeriodMillis", "wlst_path": "WP001", "default_value": 1000, "wlst_type": "integer", "restart_required": "true" } ],
34-
"RestartInPlace": [ {"version": "[12.2,12.2.1.2)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" },
35-
{"version": "[12.2.1.2,)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean" } ],
34+
"RestartInPlace": [
35+
{"version": "[12.2,12.2.1.2)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" },
36+
{"version": "[12.2.1.2,15.1.1)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "false", "derived_default": "${:true}", "wlst_type": "boolean" },
37+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "RestartInPlace", "wlst_path": "WP001", "default_value": "false", "derived_default": true, "wlst_type": "boolean" }
38+
],
3639
"SecondsBetweenRestarts": [ {"version": "[12.2,)", "wlst_mode": "both", "wlst_name": "SecondsBetweenRestarts", "wlst_path": "WP001", "default_value": 30, "wlst_type": "integer" } ],
3740
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
3841
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JDBCSystemResource.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,10 @@
227227
"ModuleType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
228228
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
229229
"PartitionName": [ {"version": "[12.2.1,)", "wlst_mode": "online", "wlst_name": "PartitionName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],
230-
"SourcePath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ],
230+
"SourcePath": [
231+
{"version": "[10,15.1.1)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" },
232+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "derived_default": true, "wlst_type": "string", "uses_path_tokens": "true" }
233+
],
231234
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
232235
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "get_method": "GET", "derived_default": true, "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
233236
},

‎core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/JMSServer.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2025, Oracle Corporation and/or its affiliates.",
2+
"copyright": "Copyright (c) 2017, 2025, Oracle and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "JMSServer${:s}",
55
"online_bean": "weblogic.management.configuration.JMSServerMBean",
@@ -47,8 +47,11 @@
4747
"folders": {},
4848
"attributes": {
4949
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSize${Kb:KB}", "wlst_path": "WP001", "default_value": 8, "wlst_type": "integer", "get_method": "LSA"} ],
50-
"DateFormatPattern": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } ,
51-
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:SSS a z}", "derived_default": "${:true}" ,"wlst_type": "string", "get_method": "${LSA:GET}" } ],
50+
"DateFormatPattern": [
51+
{"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:ss a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}", "restart_required": "true" } ,
52+
{"version": "[12.2.1,15.1.1)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:SSS a z}", "derived_default": "${:true}", "wlst_type": "string", "get_method": "${LSA:GET}" },
53+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "DateFormatPattern", "wlst_path": "WP001", "default_value": "${__NULL__:MMM d, yyyy h:mm:SSS a z}", "derived_default": true, "wlst_type": "string", "get_method": "${LSA:GET}" }
54+
],
5255
"FileCount": [
5356
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": "${__NULL__:100}", "wlst_type": "integer" },
5457
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "default_value": 7, "production_default": 100, "wlst_type": "integer" }
@@ -57,7 +60,10 @@
5760
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": "${__NULL__:5000}", "wlst_type": "integer" },
5861
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "default_value": 500, "production_default": 5000, "wlst_type": "integer" }
5962
],
60-
"FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/jmsServers/%JMSSERVER%/jms.messages.log}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true", "uses_path_tokens": "true" } ],
63+
"FileName": [
64+
{"version": "[10,15.1.1)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/jmsServers/%JMSSERVER%/jms.messages.log}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true", "uses_path_tokens": "true" },
65+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "default_value": "${__NULL__:logs/jmsServers/%JMSSERVER%/jms.messages.log}", "derived_default": true, "wlst_type": "string", "restart_required": "true", "uses_path_tokens": "true" }
66+
],
6167
"FileTimeSpan": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileTimeSpan", "wlst_path": "WP001", "default_value": 24, "wlst_type": "integer" } ],
6268
"FileTimeSpanFactor": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "FileTimeSpanFactor", "wlst_path": "WP001", "default_value": 3600000, "wlst_type": "long" } ],
6369
"LogFileRotationDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LogFileRotationDir", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true", "get_method": "${LSA:GET}" } ],

0 commit comments

Comments
 (0)