Skip to content

Commit

Permalink
Merge branch 'alias-test-1412' into 'main'
Browse files Browse the repository at this point in the history 
Fixing Generate job for 14.1.2 with JDK 17 and updating aliases

See merge request weblogic-cloud/weblogic-deploy-tooling!1502
  • Loading branch information
@robertpatrick
robertpatrick committed Sep 6, 2023
2 parents a687410 + dacb2ae commit 18654dc
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 44 deletions.
42 changes: 21 additions & 21 deletions ...urces/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,25 +204,6 @@
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceClusterParams/%COHERENCECLUSTERPARAMS%"
}
},
"CoherencePersistenceParams": {
"wlst_type": "CoherencePersistenceParams",
"online_bean": "weblogic.coherence.descriptor.wl.CoherencePersistenceParamsBean",
"version" : "[12.2.1.1,)",
"default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
"folders": {},
"attributes": {
"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" } ],
"BackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "BackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"DefaultPersistenceMode": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "DefaultPersistenceMode", "wlst_path": "WP001", "default_value": "${__NULL__:on-demand}", "wlst_type": "string" } ],
"EventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "EventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"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" } ],
"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" } ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherencePersistenceParams/%COHERENCEPERSISTENCEPARAMS%"
}
},
"CoherenceFederationParams": {
"wlst_type": "CoherenceFederationParams",
"online_bean": "weblogic.coherence.descriptor.wl.CoherenceFederationParamsBean",
Expand Down Expand Up @@ -261,6 +242,25 @@
"wlst_paths": {
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherenceLoggingParams/%COHERENCELOGGINGPARAMS%"
}
},
"CoherencePersistenceParams": {
"wlst_type": "CoherencePersistenceParams",
"online_bean": "weblogic.coherence.descriptor.wl.CoherencePersistenceParamsBean",
"version" : "[12.2.1.1,)",
"default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
"folders": {},
"attributes": {
"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" } ],
"BackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "BackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"DefaultPersistenceMode": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "DefaultPersistenceMode", "wlst_path": "WP001", "default_value": "${__NULL__:on-demand}", "wlst_type": "string" } ],
"EventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "EventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "uses_path_tokens": "true" } ],
"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" } ],
"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" } ]
},
"wlst_attributes_path": "WP001",
"wlst_paths": {
"WP001": "/CoherenceClusterSystemResource${:s}/%COHERENCECLUSTER%/Coherence${:Cluster}Resource/%COHERENCERESOURCE%/CoherencePersistenceParams/%COHERENCEPERSISTENCEPARAMS%"
}
}
},
"attributes": {
Expand Down Expand Up @@ -310,9 +310,9 @@
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
"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" } ],
"PersistenceActiveDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceActiveDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"PersistenceBackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "PersistenceBackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"PersistenceBackupDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "PersistenceBackupDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"PersistenceDefaultMode": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceDefaultMode", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"PersistenceEventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "online", "wlst_name": "PersistenceEventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"PersistenceEventsDirectory": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "PersistenceEventsDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"PersistenceSnapshotDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceSnapshotDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"PersistenceTrashDirectory": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "PersistenceTrashDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"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" },
Expand Down
46 changes: 23 additions & 23 deletions integration-tests/alias-test/generate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
</parent>

<properties>
<wls_version>${env.WLS_VERSION}</wls_version>
<mw_home>${env.ORACLE_HOME}</mw_home>
<wls_java_home>${env.JAVA_HOME}</wls_java_home>
<test_home>${project.build.directory}/test-home</test_home>
Expand All @@ -26,6 +27,8 @@
<online_domain_home>${online_domain_parent}/${domain_name}</online_domain_home>
<offline_domain_home>${offline_domain_parent}/${domain_name}</offline_domain_home>
<skip-wdt-install>${alias-test-skip-generate}</skip-wdt-install>
<alias-test-generated-offline-file-name>generatedOffline-${wls_version}.json</alias-test-generated-offline-file-name>
<alias-test-generated-online-file-name>generatedOnline-${wls_version}.json</alias-test-generated-online-file-name>
</properties>

<build>
Expand Down Expand Up @@ -61,6 +64,26 @@
</rules>
</configuration>
</execution>
<execution>
<id>enforce-wls-version-for-install</id>
<phase>install</phase>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<skip>${alias-test-skip-generate}</skip>
<rules>
<requireProperty>
<property>wls_version</property>
<message>
You must specify the wls_version property that determines the version used for verification of the aliases.
</message>
<regex>^\d+(\.\d+){3,5}$</regex>
<regexMessage>The wls_version must be a proper WLS version number with 4 to 6 numbers</regexMessage>
</requireProperty>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down Expand Up @@ -329,29 +352,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<configuration>
<!--
This plugin does not support the skip parameter so putting the functionality into the script
-->
<properties>
<skip>${alias-test-skip-generate}</skip>
<buildDir>${project.build.directory}</buildDir>
</properties>
<source>${project.basedir}/src/test/bin/GetFileNames.groovy</source>
</configuration>
<executions>
<execution>
<id>get-generated-file-names</id>
<phase>verify</phase>
<goals>
<goal>execute</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.kordamp.maven</groupId>
<artifactId>oci-maven-plugin</artifactId>
Expand Down

0 comments on commit 18654dc

Please sign in to comment.