Skip to content

Commit 6a8ac08

Browse files
committed
Merge branch 'alias-updates-20250701' into 'main'
Alias updates for future WLS versions See merge request weblogic-cloud/weblogic-deploy-tooling!1812
2 parents 91935f9 + add1dd1 commit 6a8ac08

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2016,8 +2016,10 @@
20162016
"JavaStandardTrustKeyStorePassPhraseEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JavaStandardTrustKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "secret_suffix": "javatrustkeystore" } ],
20172017
"JmsConnectionFactoryUnmappedResRefMode": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "J${ms:MS}ConnectionFactoryUnmappedResRefMode", "wlst_path": "WP001", "default_value": "${__NULL__:ReturnDefault}", "wlst_type": "string" } ],
20182018
"KeyStores": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string" } ,
2019-
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string", "restart_required": "true"} ,
2020-
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string" } ],
2019+
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string", "restart_required": "true"} ,
2020+
{"version": "[12.2.1.1,15.1.1)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string" },
2021+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "derived_default": "${:true}", "wlst_type": "string" }
2022+
],
20212023
"ListenAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": "${All Local Addresses:__NULL__}", "wlst_type": "string", "get_method": "${LSA:GET}" } ],
20222024
"ListenDelaySecs": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenDelaySecs", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
20232025
"ListenPort": [

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,8 +2034,10 @@
20342034
"JavaStandardTrustKeyStorePassPhraseEncrypted": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaStandardTrustKeyStorePassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET", "secret_suffix": "javatrustkeystore" } ],
20352035
"JmsConnectionFactoryUnmappedResRefMode": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "J${ms:MS}ConnectionFactoryUnmappedResRefMode", "wlst_path": "WP001", "default_value": "${__NULL__:ReturnDefault}", "wlst_type": "string" } ],
20362036
"KeyStores": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string" } ,
2037-
{"version": "[12.2.1,12.2.1.1)","wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string", "restart_required": "true" } ,
2038-
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string" } ],
2037+
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string", "restart_required": "true" } ,
2038+
{"version": "[12.2.1.1,15.1.1)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "wlst_type": "string" },
2039+
{"version": "[15.1.1,)", "wlst_mode": "both", "wlst_name": "KeyStores", "wlst_path": "WP001", "default_value": "${__NULL__:DemoIdentityAndDemoTrust}", "derived_default": "${:true}", "wlst_type": "string" }
2040+
],
20392041
"ListenAddress": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
20402042
"ListenDelaySecs": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ListenDelaySecs", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
20412043
"ListenPort": [

0 commit comments

Comments
 (0)