Skip to content

Commit 18654dc

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'alias-test-1412' into 'main'
Fixing Generate job for 14.1.2 with JDK 17 and updating aliases See merge request weblogic-cloud/weblogic-deploy-tooling!1502
2 parents a687410 + dacb2ae commit 18654dc

File tree

2 files changed

+44
-44
lines changed

2 files changed

+44
-44
lines changed

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

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -204,25 +204,6 @@
204204
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%"
205205
}
206206
},
207-
"CoherencePersistenceParams": {
208-
"wlst_type": "CoherencePersistenceParams",
209-
"online_bean": "weblogic.coherence.descriptor.wl.CoherencePersistenceParamsBean",
210-
"version" : "[12.2.1.1,)",
211-
"default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
212-
"folders": {},
213-
"attributes": {
214-
"ActiveDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "ActiveDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
215-
"BackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "BackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
216-
"DefaultPersistenceMode": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "DefaultPersistenceMode", "wlst_path": "WP001", "default_value": "${__NULL__:on-demand}", "wlst_type": "string" } ],
217-
"EventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "EventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
218-
"SnapshotDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "SnapshotDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
219-
"TrashDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "TrashDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ]
220-
},
221-
"wlst_attributes_path": "WP001",
222-
"wlst_paths": {
223-
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherencePersistenceParams/%COHERENCEPERSISTENCEPARAMS%"
224-
}
225-
},
226207
"CoherenceFederationParams": {
227208
"wlst_type": "CoherenceFederationParams",
228209
"online_bean": "weblogic.coherence.descriptor.wl.CoherenceFederationParamsBean",
@@ -261,6 +242,25 @@
261242
"wlst_paths": {
262243
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceLoggingParams/%COHERENCELOGGINGPARAMS%"
263244
}
245+
},
246+
"CoherencePersistenceParams": {
247+
"wlst_type": "CoherencePersistenceParams",
248+
"online_bean": "weblogic.coherence.descriptor.wl.CoherencePersistenceParamsBean",
249+
"version" : "[12.2.1.1,)",
250+
"default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
251+
"folders": {},
252+
"attributes": {
253+
"ActiveDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "ActiveDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
254+
"BackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "BackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
255+
"DefaultPersistenceMode": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "DefaultPersistenceMode", "wlst_path": "WP001", "default_value": "${__NULL__:on-demand}", "wlst_type": "string" } ],
256+
"EventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "EventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
257+
"SnapshotDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "SnapshotDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
258+
"TrashDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "TrashDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ]
259+
},
260+
"wlst_attributes_path": "WP001",
261+
"wlst_paths": {
262+
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherencePersistenceParams/%COHERENCEPERSISTENCEPARAMS%"
263+
}
264264
}
265265
},
266266
"attributes": {
@@ -310,9 +310,9 @@
310310
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
311311
"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" } ],
312312
"PersistenceActiveDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceActiveDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
313-
"PersistenceBackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "PersistenceBackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
313+
"PersistenceBackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "PersistenceBackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
314314
"PersistenceDefaultMode": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceDefaultMode", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
315-
"PersistenceEventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "PersistenceEventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
315+
"PersistenceEventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "PersistenceEventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
316316
"PersistenceSnapshotDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceSnapshotDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
317317
"PersistenceTrashDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceTrashDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
318318
"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" },

‎integration-tests/alias-test/generate/pom.xml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
</parent>
1818

1919
<properties>
20+
<wls_version>${env.WLS_VERSION}</wls_version>
2021
<mw_home>${env.ORACLE_HOME}</mw_home>
2122
<wls_java_home>${env.JAVA_HOME}</wls_java_home>
2223
<test_home>${project.build.directory}/test-home</test_home>
@@ -26,6 +27,8 @@
2627
<online_domain_home>${online_domain_parent}/${domain_name}</online_domain_home>
2728
<offline_domain_home>${offline_domain_parent}/${domain_name}</offline_domain_home>
2829
<skip-wdt-install>${alias-test-skip-generate}</skip-wdt-install>
30+
<alias-test-generated-offline-file-name>generatedOffline-${wls_version}.json</alias-test-generated-offline-file-name>
31+
<alias-test-generated-online-file-name>generatedOnline-${wls_version}.json</alias-test-generated-online-file-name>
2932
</properties>
3033

3134
<build>
@@ -61,6 +64,26 @@
6164
</rules>
6265
</configuration>
6366
</execution>
67+
<execution>
68+
<id>enforce-wls-version-for-install</id>
69+
<phase>install</phase>
70+
<goals>
71+
<goal>enforce</goal>
72+
</goals>
73+
<configuration>
74+
<skip>${alias-test-skip-generate}</skip>
75+
<rules>
76+
<requireProperty>
77+
<property>wls_version</property>
78+
<message>
79+
You must specify the wls_version property that determines the version used for verification of the aliases.
80+
</message>
81+
<regex>^\d+(\.\d+){3,5}$</regex>
82+
<regexMessage>The wls_version must be a proper WLS version number with 4 to 6 numbers</regexMessage>
83+
</requireProperty>
84+
</rules>
85+
</configuration>
86+
</execution>
6487
</executions>
6588
</plugin>
6689
<plugin>
@@ -329,29 +352,6 @@
329352
</execution>
330353
</executions>
331354
</plugin>
332-
<plugin>
333-
<groupId>org.codehaus.gmaven</groupId>
334-
<artifactId>gmaven-plugin</artifactId>
335-
<configuration>
336-
<!--
337-
This plugin does not support the skip parameter so putting the functionality into the script
338-
-->
339-
<properties>
340-
<skip>${alias-test-skip-generate}</skip>
341-
<buildDir>${project.build.directory}</buildDir>
342-
</properties>
343-
<source>${project.basedir}/src/test/bin/GetFileNames.groovy</source>
344-
</configuration>
345-
<executions>
346-
<execution>
347-
<id>get-generated-file-names</id>
348-
<phase>verify</phase>
349-
<goals>
350-
<goal>execute</goal>
351-
</goals>
352-
</execution>
353-
</executions>
354-
</plugin>
355355
<plugin>
356356
<groupId>org.kordamp.maven</groupId>
357357
<artifactId>oci-maven-plugin</artifactId>

0 commit comments

Comments
 (0)