Skip to content

Commit 97c0e66

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'wlst-offline-updates' into 'main'
Updating aliases for 14.1.2 changes and dependabot versions See merge request weblogic-cloud/weblogic-deploy-tooling!1566
2 parents eb434fc + 63c9c9f commit 97c0e66

File tree

11 files changed

+28
-29
lines changed

11 files changed

+28
-29
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@
9595
"Determiner": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Determiner${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
9696
"DeterminerCandidateResourceInfoList": [ {"version": "[12.2.1,)", "wlst_mode": "online", "wlst_name": "DeterminerCandidateResourceInfoList", "wlst_path": "WP001", "default_value": "", "wlst_type": "jarray", "access": "IGNORED" } ],
9797
"ForgetHeuristics": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "ForgetHeuristics", "derived_default": "${:true}", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
98-
"LocalDomainSecurityCacheEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LocalDomainSecurityCacheEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
99-
"LocalDomainSecurityCacheTTL": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LocalDomainSecurityCacheTTL", "wlst_path": "WP001", "default_value": "300", "wlst_type": "integer" } ],
100-
"LocalDomainSecurityEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LocalDomainSecurityEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
98+
"LocalDomainSecurityCacheEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LocalDomainSecurityCacheEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
99+
"LocalDomainSecurityCacheTtl": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LocalDomainSecurityCacheT${tl:TL}", "wlst_path": "WP001", "default_value": "300", "wlst_type": "integer" } ],
100+
"LocalDomainSecurityEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LocalDomainSecurityEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
101101
"MaxResourceRequestsOnServer": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "MaxResourceRequestsOnServer", "derived_default": "${:true}", "wlst_path": "WP001", "default_value": 50, "wlst_type": "integer" } ],
102102
"MaxResourceUnavailableMillis": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "MaxResourceUnavailableMillis", "derived_default": "${:true}", "wlst_path": "WP001", "default_value": 1800000, "wlst_type": "long" } ],
103103
"MaxRetrySecondsBeforeDeterminerFail": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "MaxRetrySecondsBeforeDeterminerFail", "derived_default": "${:true}", "wlst_path": "WP001", "default_value": 300, "wlst_type": "integer" } ],

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,12 @@
182182
{"version": "[14.1.1.0.0.221010,14.1.2)", "wlst_mode": "online", "wlst_name": "GlobalSocketProvider", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" },
183183
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "GlobalSocketProvider", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean" }
184184
],
185-
"MulticastListenAddress": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MulticastListenAddress", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
186-
"MulticastListenPort": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MulticastListenPort", "wlst_path": "WP001", "default_value": "${__NULL__:33387}", "wlst_type": "integer", "get_method": "LSA"} ],
187-
"SecuredProduction": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "SecuredProduction", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
188-
"SecurityFrameworkEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SecurityFrameworkEnabled", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
189-
"TimeToLive": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "TimeToLive", "wlst_path": "WP001", "default_value": "${__NULL__:4}", "wlst_type": "integer", "get_method": "LSA"} ],
185+
"IgnoreHostnameVerification": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "IgnoreHostnameVerification", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ],
186+
"MulticastListenAddress": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MulticastListenAddress", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
187+
"MulticastListenPort": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MulticastListenPort", "wlst_path": "WP001", "default_value": "${__NULL__:33387}", "wlst_type": "integer", "get_method": "LSA"} ],
188+
"SecuredProduction": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "SecuredProduction", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
189+
"SecurityFrameworkEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SecurityFrameworkEnabled", "wlst_path": "WP001", "default_value": "${__NULL__:false}", "wlst_type": "boolean", "get_method": "LSA"} ],
190+
"TimeToLive": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "TimeToLive", "wlst_path": "WP001", "default_value": "${__NULL__:4}", "wlst_type": "integer", "get_method": "LSA"} ],
190191
"Transport": [
191192
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "Transport", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" },
192193
{"version": "[12.1.2,12.2.1.4.0.220929)", "wlst_mode": "online", "wlst_name": "Transport", "wlst_path": "WP001", "default_value": "udp", "wlst_type": "string" },

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@
2222
"ConfigurationVersion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigurationVersion", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
2323
"ConsoleContextPath": [
2424
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "console", "wlst_type": "string", "uses_path_tokens": "true" },
25-
{"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "retired-console", "wlst_type": "string", "uses_path_tokens": "true" },
26-
{"version": "[14.1.2,)", "wlst_mode": "offline", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "console", "wlst_type": "string", "uses_path_tokens": "true" }
25+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "retired-console", "wlst_type": "string", "uses_path_tokens": "true" }
2726
],
2827
"ConsoleEnabled": [
2928
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" },
30-
{"version": "[14.1.2,)", "wlst_mode": "offline", "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" },
31-
{"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }
29+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ConsoleEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }
3230
],
3331
"ConsoleExtensionDirectory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConsoleExtensionDirectory", "wlst_path": "WP001", "default_value": "console-ext", "wlst_type": "string", "uses_path_tokens": "true" } ],
3432
"DbPassiveMode": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "${Db:DB}PassiveMode", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
@@ -66,7 +64,7 @@
6664
{"version": "[12.2.1.1,12.2.1.3)","wlst_mode": "both", "wlst_name": "ServiceMigrationHistorySize", "wlst_path": "WP001", "default_value": -1, "wlst_type": "integer" },
6765
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ServiceMigrationHistorySize", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
6866
"SiteName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "SiteName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
69-
"VirtualThreadEnableOption": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "VirtualThreadEnableOption", "wlst_path": "WP001", "default_value": "enabled", "wlst_type": "string" } ]
67+
"VirtualThreadEnableOption": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "VirtualThreadEnableOption", "wlst_path": "WP001", "default_value": "enabled", "wlst_type": "string" } ]
7068
},
7169
"wlst_attributes_path": "WP001",
7270
"wlst_paths": {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
"DeterminerCandidateResourceInfoList": [ {"version": "[12.2.1,)", "wlst_mode": "online", "wlst_name": "DeterminerCandidateResourceInfoList", "wlst_path": "WP001", "default_value": "[]", "wlst_type": "jarray", "access": "IGNORED" } ],
1919
"Determiner": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Determiner${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string" , "get_method": "LSA" } ],
2020
"ForgetHeuristics": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ForgetHeuristics", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
21-
"LocalDomainSecurityCacheEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LocalDomainSecurityCacheEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
22-
"LocalDomainSecurityCacheTTL": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LocalDomainSecurityCacheTTL", "wlst_path": "WP001", "default_value": "300", "wlst_type": "integer" } ],
23-
"LocalDomainSecurityEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "LocalDomainSecurityEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
21+
"LocalDomainSecurityCacheEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LocalDomainSecurityCacheEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
22+
"LocalDomainSecurityCacheTtl": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LocalDomainSecurityCacheT${tl:TL}", "wlst_path": "WP001", "default_value": "300", "wlst_type": "integer" } ],
23+
"LocalDomainSecurityEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "LocalDomainSecurityEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
2424
"MaxResourceRequestsOnServer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxResourceRequestsOnServer", "wlst_path": "WP001", "default_value": 50, "wlst_type": "integer" } ],
2525
"MaxResourceUnavailableMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxResourceUnavailableMillis", "wlst_path": "WP001", "default_value": 1800000, "wlst_type": "long" } ],
2626
"MaxRetrySecondsBeforeDeterminerFail": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "MaxRetrySecondsBeforeDeterminerFail", "wlst_path": "WP001", "default_value": 300, "wlst_type": "integer" } ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"default_name_value": "${NO_NAME_0:%DOMAIN%}",
88
"folders": {},
99
"attributes": {
10-
"ContextPath": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ContextPath", "wlst_path": "WP001", "default_value": "${consolehelper:console}", "wlst_type": "string" } ],
10+
"ContextPath": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ContextPath", "wlst_path": "WP001", "default_value": "console", "wlst_type": "string" } ],
1111
"CookieName": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "CookieName", "wlst_path": "WP001", "default_value": "REMOTECONSOLESESSION", "wlst_type": "string" } ],
1212
"Notes": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1313
"ProtectedCookieEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "ProtectedCookieEnabled", "wlst_path": "WP001", "default_value": true, "wlst_type": "boolean" } ],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,8 +1741,8 @@
17411741
"CredentialEncrypted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CredentialEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "get_method": "GET"} ],
17421742
"CredentialGenerated": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "CredentialGenerated", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "get_method": "GET", "restart_required": "true"} ],
17431743
"CrossDomainSecurityEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CrossDomainSecurityEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1744-
"CrossDomainSecurityCacheEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "CrossDomainSecurityCacheEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1745-
"CrossDomainSecurityCacheTTL": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "CrossDomainSecurityCacheTTL", "wlst_path": "WP001", "default_value": "300", "wlst_type": "integer" } ],
1744+
"CrossDomainSecurityCacheEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "CrossDomainSecurityCacheEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1745+
"CrossDomainSecurityCacheTtl": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "CrossDomainSecurityCacheT${tl:TL}", "wlst_path": "WP001", "default_value": "300", "wlst_type": "integer" } ],
17461746
"DefaultRealm": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultRealm", "wlst_path": "WP001", "default_value": "myrealm", "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "${:MBEAN.set_security_realm_mbean}", "set_mbean_type": "weblogic.management.configuration.SecurityMBean", "restart_required": "true" } ],
17471747
"DefaultRealmInternal": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "DefaultRealmInternal", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
17481748
"DowngradeUntrustedPrincipals": [ {"version": "[10,12.2.1)", "wlst_mode": "both", "wlst_name": "DowngradeUntrustedPrincipals", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
"ResponseTimeRequestClass": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ResponseTimeRequestClass", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_self_tuning_mbean", "set_mbean_type": "weblogic.management.configuration.ResponseTimeRequestClassMBean"} ],
173173
"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" },
174174
{"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"} ],
175-
"UseVirtualThreads": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "UseVirtualThreads", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ]
175+
"UseVirtualThreads": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "UseVirtualThreads", "wlst_path": "WP001", "default_value": false, "wlst_type": "boolean" } ]
176176
},
177177
"wlst_attributes_path": "WP001",
178178
"wlst_paths": {

0 commit comments

Comments
 (0)