Address Copilot review: make API-version error messages syntax-neutral

Error messages for the webhooks/node-sources API-version gates only
referenced the legacy --include-webhooks/--include-node-sources flags,
which was misleading when using the new --include webhooks/nodeSources
syntax.

Author: fdevans

rd-cli-tool/src/main/java/org/rundeck/client/tool/commands/projects/Archives.java

@@ -192,13 +192,13 @@ public int importArchive(@CommandLine.Mixin ArchiveImportOpts opts) throws Input
         }
         Set<ImportFlags> importFlags = opts.calculateFlags();
         if ((importFlags.contains(ImportFlags.webhooks) || opts.isWhkRegenAuthTokens()) && getRdTool().getClient().getApiVersion() < 34) {
-            throw new InputError(String.format("Cannot use --include-webhooks or --regenerate-tokens with API < 34 (currently: %s)", getRdTool().getClient().getApiVersion()));
+            throw new InputError(String.format("Cannot include webhooks (--include-webhooks or --include webhooks) or use --regenerate-tokens with API < 34 (currently: %s)", getRdTool().getClient().getApiVersion()));
         }
         if ((importFlags.contains(ImportFlags.webhooks) && opts.isWhkRegenUuid()) && getRdTool().getClient().getApiVersion() < 47) {
-            throw new InputError(String.format("Cannot use --include-webhooks with --remove-webhooks-uuids with API < 47 (currently: %s)", getRdTool().getClient().getApiVersion()));
+            throw new InputError(String.format("Cannot include webhooks (--include-webhooks or --include webhooks) with --remove-webhooks-uuids with API < 47 (currently: %s)", getRdTool().getClient().getApiVersion()));
         }
         if ((importFlags.contains(ImportFlags.nodeSources)) && getRdTool().getClient().getApiVersion() < 38) {
-            throw new InputError(String.format("Cannot use --include-node-sources with API < 38 (currently: %s)", getRdTool().getClient().getApiVersion()));
+            throw new InputError(String.format("Cannot include node sources (--include-node-sources or --include nodeSources) with API < 38 (currently: %s)", getRdTool().getClient().getApiVersion()));
         }
         RequestBody body = RequestBody.create(input, Client.MEDIA_TYPE_ZIP);
 

rd-cli-tool/src/test/groovy/org/rundeck/client/tool/commands/projects/ArchivesSpec.groovy

@@ -118,7 +118,7 @@ class ArchivesSpec extends Specification {
 
         then:
         InputError exc = thrown()
-        exc.message.contains('Cannot use --include-webhooks or --regenerate-tokens with API < 34')
+        exc.message.contains('Cannot include webhooks (--include-webhooks or --include webhooks) or use --regenerate-tokens with API < 34')
 
         where:
         apiversion = 33
@@ -220,7 +220,7 @@ class ArchivesSpec extends Specification {
 
         then:
         InputError exc = thrown()
-        exc.message.contains('Cannot use --include-node-sources with API < 38')
+        exc.message.contains('Cannot include node sources (--include-node-sources or --include nodeSources) with API < 38')
 
         where:
         apiversion = 37
@@ -320,7 +320,7 @@ class ArchivesSpec extends Specification {
 
         then:
         InputError exc = thrown()
-        exc.message.contains('Cannot use --include-webhooks with --remove-webhooks-uuids with API < 47')
+        exc.message.contains('Cannot include webhooks (--include-webhooks or --include webhooks) with --remove-webhooks-uuids with API < 47')
 
         where:
         apiversion = 46