diff --git a/.gitignore b/.gitignore index c5ca2e00..b05a3bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,6 @@ pom.xml.releaseBackup pom.xml.versionsBackup release.properties velocity.log* + +# Worktrees +.worktrees/ diff --git a/README.md b/README.md index 12e9fee1..a4a51d5d 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,16 @@ oscal-cli --help /opt/oscal-cli/bin/oscal-cli --help ``` +### Disabling Color Output + +The CLI uses ANSI escape codes for colored output, which is supported by most modern terminals including Windows 10+, Linux, and macOS. If you are using a legacy console that does not support ANSI escape codes (e.g., older Windows cmd.exe, certain CI/CD environments, or when redirecting output to a file), you may see raw escape sequences in the output. + +To disable colored output, use the `--no-color` flag: + +```sh +oscal-cli --no-color +``` + ## Building This project can be built with [Apache Maven](https://maven.apache.org/) version 3.8.4 or greater. diff --git a/pom.xml b/pom.xml index 1d8297cc..532eea8d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ dev.metaschema.oscal oscal-cli-enhanced - 2.7.0-SNAPSHOT + 3.0.0-SNAPSHOT jar @@ -23,16 +23,16 @@ ${scm.url}/tree/develop scm:git:git@github.com/metaschema-framework/oscal-cli.git scm:git:git@github.com:metaschema-framework/oscal-cli.git - v0.2.0 + HEAD central - Maven Central Repository + Maven Central Repository https://central.sonatype.com - - false - + + false + repo-snapshot @@ -74,7 +74,7 @@ 3.0.0-SNAPSHOT - 6.1.0-SNAPSHOT + 7.0.0-SNAPSHOT https://oscal-cli.metaschema.dev @@ -105,58 +105,56 @@ 2.25.3 7.10.0 4.9.1 - 5.3.0 - 6.0.19 - + 0.9.0 - central - Maven Central Repository - https://repo.maven.apache.org/maven2 - - false - - - - repo-snapshot - Local Snapshots - https://raw.githubusercontent.com/metaschema-framework/maven2/refs/heads/main - - false - - - true - always - - - - + central + Maven Central Repository + https://repo.maven.apache.org/maven2 + + false + + + + repo-snapshot + Local Snapshots + https://raw.githubusercontent.com/metaschema-framework/maven2/refs/heads/main + + false + + + true + always + + + + + + central + Maven Central Repository + https://repo.maven.apache.org/maven2 + + false + + - central - Maven Central Repository - https://repo.maven.apache.org/maven2 - - false - - - - repo-snapshot - Local Snapshots - https://raw.githubusercontent.com/metaschema-framework/maven2/refs/heads/main - - false - - - true - always - - - + repo-snapshot + Local Snapshots + https://raw.githubusercontent.com/metaschema-framework/maven2/refs/heads/main + + false + + + true + always + + + - + org.apache.logging.log4j @@ -173,11 +171,6 @@ pom import - - org.apache.xmlbeans - xmlbeans - ${dependency.xmlbeans.version} - @@ -185,17 +178,6 @@ dev.metaschema.oscal liboscal-java ${dependency.liboscal-java.version} - - - - dev.metaschema.java - metaschema-core - - - dev.metaschema.java - metaschema-databind - - dev.metaschema.java @@ -212,16 +194,6 @@ metaschema-schema-generator ${dependency.metaschema-framework.version} - - dev.metaschema.java - metaschema-core - ${dependency.metaschema-framework.version} - - - dev.metaschema.java - metaschema-databind - ${dependency.metaschema-framework.version} - org.apache.logging.log4j @@ -243,21 +215,6 @@ commons-io ${dependency.commons-io.version} - - org.xmlresolver - xmlresolver - ${dependency.xmlresolver.version} - - - org.xmlresolver - xmlresolver - ${dependency.xmlresolver.version} - data - - - org.apache.xmlbeans - xmlbeans - com.github.erosb everit-json-schema @@ -447,7 +404,7 @@ - gov.nist.secauto.oscal.tools.cli.core.CLI + dev.metaschema.oscal.tools.cli.core.CLI true custom @@ -463,7 +420,7 @@ - gov.nist.secauto.oscal.tools.cli.core.CLI + dev.metaschema.oscal.tools.cli.core.CLI oscal-cli diff --git a/src/main/distro/README.txt b/src/main/distro/README.txt index ccead9d3..fd6e3a35 100644 --- a/src/main/distro/README.txt +++ b/src/main/distro/README.txt @@ -28,6 +28,19 @@ The tool can be run as follows: oscal-cli --help +Disabling Color Output: +----------------------- + +The CLI uses ANSI escape codes for colored output, which is supported by most +modern terminals including Windows 10+, Linux, and macOS. If you are using a +legacy console that does not support ANSI escape codes (e.g., older Windows +cmd.exe, certain CI/CD environments, or when redirecting output to a file), +you may see raw escape sequences in the output. + +To disable colored output, use the --no-color flag: + + oscal-cli --no-color + Feedback: --------- diff --git a/src/main/java-templates/gov/nist/secauto/oscal/tools/cli/core/OscalCliVersion.java b/src/main/java-templates/dev/metaschema/oscal/tools/cli/core/OscalCliVersion.java similarity index 96% rename from src/main/java-templates/gov/nist/secauto/oscal/tools/cli/core/OscalCliVersion.java rename to src/main/java-templates/dev/metaschema/oscal/tools/cli/core/OscalCliVersion.java index df659bc5..c67c74c1 100644 --- a/src/main/java-templates/gov/nist/secauto/oscal/tools/cli/core/OscalCliVersion.java +++ b/src/main/java-templates/dev/metaschema/oscal/tools/cli/core/OscalCliVersion.java @@ -24,9 +24,9 @@ * OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR SERVICES PROVIDED HEREUNDER. */ -package gov.nist.secauto.oscal.tools.cli.core; +package dev.metaschema.oscal.tools.cli.core; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; +import dev.metaschema.core.util.IVersionInfo; /** * Provides version information for this application. diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/CLI.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/CLI.java similarity index 60% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/CLI.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/CLI.java index 90b6a014..22182982 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/CLI.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/CLI.java @@ -3,28 +3,28 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core; +package dev.metaschema.oscal.tools.cli.core; -import gov.nist.secauto.metaschema.cli.processor.CLIProcessor; -import gov.nist.secauto.metaschema.cli.processor.ExitStatus; -import gov.nist.secauto.metaschema.core.MetaschemaJavaVersion; -import gov.nist.secauto.metaschema.core.model.MetaschemaVersion; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.IVersionInfo; -import gov.nist.secauto.oscal.lib.LibOscalVersion; -import gov.nist.secauto.oscal.lib.OscalVersion; -import gov.nist.secauto.oscal.tools.cli.core.commands.ConvertCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ListAllowedValuesCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ResolveCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ValidateCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.assessmentplan.AssessmentPlanCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.assessmentresults.AssessmentResultsCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.catalog.CatalogCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.componentdefinition.ComponentDefinitionCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.metaschema.MetaschemaCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.poam.PlanOfActionsAndMilestonesCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.profile.ProfileCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ssp.SystemSecurityPlanCommand; +import dev.metaschema.cli.processor.CLIProcessor; +import dev.metaschema.cli.processor.ExitStatus; +import dev.metaschema.core.MetaschemaJavaVersion; +import dev.metaschema.core.model.MetaschemaVersion; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.IVersionInfo; +import dev.metaschema.oscal.lib.LibOscalVersion; +import dev.metaschema.oscal.lib.OscalVersion; +import dev.metaschema.oscal.tools.cli.core.commands.ConvertCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ListAllowedValuesCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ResolveCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ValidateCommand; +import dev.metaschema.oscal.tools.cli.core.commands.assessmentplan.AssessmentPlanCommand; +import dev.metaschema.oscal.tools.cli.core.commands.assessmentresults.AssessmentResultsCommand; +import dev.metaschema.oscal.tools.cli.core.commands.catalog.CatalogCommand; +import dev.metaschema.oscal.tools.cli.core.commands.componentdefinition.ComponentDefinitionCommand; +import dev.metaschema.oscal.tools.cli.core.commands.metaschema.MetaschemaCommand; +import dev.metaschema.oscal.tools.cli.core.commands.poam.PlanOfActionsAndMilestonesCommand; +import dev.metaschema.oscal.tools.cli.core.commands.profile.ProfileCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ssp.SystemSecurityPlanCommand; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractDeprecatedOscalValidationSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractDeprecatedOscalValidationSubcommand.java similarity index 82% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractDeprecatedOscalValidationSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractDeprecatedOscalValidationSubcommand.java index cd7b9cfc..3630a0f0 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractDeprecatedOscalValidationSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractDeprecatedOscalValidationSubcommand.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; +package dev.metaschema.oscal.tools.cli.core.commands; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; import org.apache.commons.cli.CommandLine; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractOscalConvertCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractOscalConvertCommand.java similarity index 75% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractOscalConvertCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractOscalConvertCommand.java index 45872fd5..332f53f4 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractOscalConvertCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractOscalConvertCommand.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; +package dev.metaschema.oscal.tools.cli.core.commands; -import gov.nist.secauto.metaschema.cli.commands.AbstractConvertSubcommand; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.oscal.lib.OscalBindingContext; +import dev.metaschema.cli.commands.AbstractConvertSubcommand; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.oscal.lib.OscalBindingContext; import org.apache.commons.cli.CommandLine; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractOscalValidationCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractOscalValidationCommand.java similarity index 74% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractOscalValidationCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractOscalValidationCommand.java index 721cab58..39651565 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractOscalValidationCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractOscalValidationCommand.java @@ -3,22 +3,22 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; - -import gov.nist.secauto.metaschema.cli.commands.AbstractValidateContentCommand; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.IBindingContext.ISchemaValidationProvider; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.OscalCompleteModule; +package dev.metaschema.oscal.tools.cli.core.commands; + +import dev.metaschema.cli.commands.AbstractValidateContentCommand; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.IBindingContext.ISchemaValidationProvider; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.OscalCompleteModule; import org.apache.commons.cli.CommandLine; import org.json.JSONObject; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractResolveCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractResolveCommand.java similarity index 83% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractResolveCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractResolveCommand.java index f0a20de0..fb2f2bde 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/AbstractResolveCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/AbstractResolveCommand.java @@ -3,31 +3,31 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; +package dev.metaschema.oscal.tools.cli.core.commands; -import gov.nist.secauto.metaschema.cli.commands.MetaschemaCommands; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDocumentNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.core.util.UriUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.DeserializationFeature; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.io.ISerializer; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.lib.model.Profile; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver; -import gov.nist.secauto.oscal.tools.cli.core.utils.PrettyPrinter; +import dev.metaschema.cli.commands.MetaschemaCommands; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.item.node.IDocumentNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItem; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.core.util.UriUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.DeserializationFeature; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.ISerializer; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.lib.model.Profile; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver; +import dev.metaschema.oscal.tools.cli.core.utils.PrettyPrinter; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ConvertCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ConvertCommand.java similarity index 74% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ConvertCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ConvertCommand.java index ad9ee39d..bc2ee475 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ConvertCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ConvertCommand.java @@ -3,19 +3,19 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; +package dev.metaschema.oscal.tools.cli.core.commands; -import gov.nist.secauto.metaschema.cli.commands.AbstractConvertSubcommand; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.FormatDetector; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.metaschema.databind.io.ISerializer; -import gov.nist.secauto.metaschema.databind.io.ModelDetector; -import gov.nist.secauto.oscal.lib.OscalBindingContext; +import dev.metaschema.cli.commands.AbstractConvertSubcommand; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.FormatDetector; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.databind.io.ISerializer; +import dev.metaschema.databind.io.ModelDetector; +import dev.metaschema.oscal.lib.OscalBindingContext; import org.apache.commons.cli.CommandLine; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ListAllowedValuesCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ListAllowedValuesCommand.java similarity index 86% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ListAllowedValuesCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ListAllowedValuesCommand.java index f341eb64..5ef4fa16 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ListAllowedValuesCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ListAllowedValuesCommand.java @@ -3,36 +3,36 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; +package dev.metaschema.oscal.tools.cli.core.commands; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder; import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator; -import gov.nist.secauto.metaschema.cli.commands.MetaschemaCommands; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractTerminalCommand; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.metaschema.cli.processor.command.ExtraArgument; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.metapath.DynamicContext; -import gov.nist.secauto.metaschema.core.metapath.StaticContext; -import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.IModuleNodeItem; -import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory; -import gov.nist.secauto.metaschema.core.model.IModule; -import gov.nist.secauto.metaschema.core.model.MetaschemaException; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue; -import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint; -import gov.nist.secauto.metaschema.core.model.constraint.IConstraintSet; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.IBindingContext; -import gov.nist.secauto.metaschema.databind.model.IBoundModule; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.OscalCompleteModule; -import gov.nist.secauto.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor; -import gov.nist.secauto.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.AllowedValuesRecord; +import dev.metaschema.cli.commands.MetaschemaCommands; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.command.AbstractTerminalCommand; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.cli.processor.command.ExtraArgument; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.metapath.DynamicContext; +import dev.metaschema.core.metapath.StaticContext; +import dev.metaschema.core.metapath.item.node.IDefinitionNodeItem; +import dev.metaschema.core.metapath.item.node.IModuleNodeItem; +import dev.metaschema.core.metapath.item.node.INodeItemFactory; +import dev.metaschema.core.model.IModule; +import dev.metaschema.core.model.MetaschemaException; +import dev.metaschema.core.model.constraint.IAllowedValue; +import dev.metaschema.core.model.constraint.IAllowedValuesConstraint; +import dev.metaschema.core.model.constraint.IConstraintSet; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.IBindingContext; +import dev.metaschema.databind.model.IBoundModule; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.OscalCompleteModule; +import dev.metaschema.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor; +import dev.metaschema.oscal.lib.model.util.AllowedValueCollectingNodeItemVisitor.AllowedValuesRecord; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ResolveCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ResolveCommand.java similarity index 88% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ResolveCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ResolveCommand.java index db7dc75f..9f2d9a60 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ResolveCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ResolveCommand.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; +package dev.metaschema.oscal.tools.cli.core.commands; import edu.umd.cs.findbugs.annotations.NonNull; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ValidateCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ValidateCommand.java similarity index 70% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ValidateCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ValidateCommand.java index 8512a7dc..645e2f2e 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ValidateCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ValidateCommand.java @@ -3,17 +3,17 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; - -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.ICommandExecutor; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; +package dev.metaschema.oscal.tools.cli.core.commands; + +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.ICommandExecutor; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; import org.apache.commons.cli.CommandLine; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/AssessmentPlanCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/AssessmentPlanCommand.java similarity index 82% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/AssessmentPlanCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/AssessmentPlanCommand.java index bc432442..702b7ef4 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/AssessmentPlanCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/AssessmentPlanCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.assessmentplan; +package dev.metaschema.oscal.tools.cli.core.commands.assessmentplan; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to an OSCAL diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/ConvertSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/ConvertSubcommand.java similarity index 62% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/ConvertSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/ConvertSubcommand.java index a8918bd8..320cb167 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/ConvertSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/ConvertSubcommand.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.assessmentplan; +package dev.metaschema.oscal.tools.cli.core.commands.assessmentplan; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.oscal.lib.model.AssessmentPlan; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ConvertCommand; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.oscal.lib.model.AssessmentPlan; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ConvertCommand; /** * Provides an OSCAL content conversion command. diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/ValidateSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/ValidateSubcommand.java similarity index 65% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/ValidateSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/ValidateSubcommand.java index 2977cc55..132db821 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentplan/ValidateSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentplan/ValidateSubcommand.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.assessmentplan; +package dev.metaschema.oscal.tools.cli.core.commands.assessmentplan; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/AssessmentResultsCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/AssessmentResultsCommand.java similarity index 82% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/AssessmentResultsCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/AssessmentResultsCommand.java index 4c62756c..40acad77 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/AssessmentResultsCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/AssessmentResultsCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.assessmentresults; +package dev.metaschema.oscal.tools.cli.core.commands.assessmentresults; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to an OSCAL diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/ConvertSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/ConvertSubcommand.java similarity index 62% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/ConvertSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/ConvertSubcommand.java index 5fc0e3aa..3f5a237e 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/ConvertSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/ConvertSubcommand.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.assessmentresults; +package dev.metaschema.oscal.tools.cli.core.commands.assessmentresults; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.oscal.lib.model.AssessmentResults; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ConvertCommand; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.oscal.lib.model.AssessmentResults; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ConvertCommand; /** * Provides an OSCAL content conversion command. diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/ValidateSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/ValidateSubcommand.java similarity index 65% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/ValidateSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/ValidateSubcommand.java index 3ef5d7d1..29aa93aa 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/assessmentresults/ValidateSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/assessmentresults/ValidateSubcommand.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.assessmentresults; +package dev.metaschema.oscal.tools.cli.core.commands.assessmentresults; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/CatalogCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/CatalogCommand.java similarity index 82% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/CatalogCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/CatalogCommand.java index 3a7e75e5..37d9c07c 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/CatalogCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/CatalogCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.catalog; +package dev.metaschema.oscal.tools.cli.core.commands.catalog; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to an OSCAL diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/ConvertSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/ConvertSubcommand.java similarity index 63% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/ConvertSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/ConvertSubcommand.java index c4651597..47899f98 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/ConvertSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/ConvertSubcommand.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.catalog; +package dev.metaschema.oscal.tools.cli.core.commands.catalog; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.oscal.lib.model.Catalog; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ConvertCommand; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.oscal.lib.model.Catalog; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ConvertCommand; /** * Provides an OSCAL content conversion command. diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/ValidateSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/ValidateSubcommand.java similarity index 65% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/ValidateSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/ValidateSubcommand.java index 7e2dc7dd..441d052e 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/catalog/ValidateSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/catalog/ValidateSubcommand.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.catalog; +package dev.metaschema.oscal.tools.cli.core.commands.catalog; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ComponentDefinitionCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ComponentDefinitionCommand.java similarity index 82% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ComponentDefinitionCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ComponentDefinitionCommand.java index 37d1715b..fd175629 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ComponentDefinitionCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ComponentDefinitionCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.componentdefinition; +package dev.metaschema.oscal.tools.cli.core.commands.componentdefinition; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to an OSCAL diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ConvertSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ConvertSubcommand.java similarity index 62% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ConvertSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ConvertSubcommand.java index 59d6807f..f17816e6 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ConvertSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ConvertSubcommand.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.componentdefinition; +package dev.metaschema.oscal.tools.cli.core.commands.componentdefinition; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.oscal.lib.model.ComponentDefinition; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ConvertCommand; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.oscal.lib.model.ComponentDefinition; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ConvertCommand; /** * Provides an OSCAL content conversion command. diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ValidateSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ValidateSubcommand.java similarity index 65% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ValidateSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ValidateSubcommand.java index 41785368..68900ef5 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/componentdefinition/ValidateSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/componentdefinition/ValidateSubcommand.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.componentdefinition; +package dev.metaschema.oscal.tools.cli.core.commands.componentdefinition; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/metaschema/MetaschemaCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/metaschema/MetaschemaCommand.java similarity index 74% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/metaschema/MetaschemaCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/metaschema/MetaschemaCommand.java index 921283c4..a56c53f3 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/metaschema/MetaschemaCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/metaschema/MetaschemaCommand.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.metaschema; +package dev.metaschema.oscal.tools.cli.core.commands.metaschema; -import gov.nist.secauto.metaschema.cli.commands.MetaschemaCommands; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.commands.MetaschemaCommands; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to Metaschema diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/metaschema/package-info.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/metaschema/package-info.java similarity index 64% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/metaschema/package-info.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/metaschema/package-info.java index 5fdc4899..e6181b6d 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/metaschema/package-info.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/metaschema/package-info.java @@ -7,4 +7,4 @@ * Hosts Metaschema-related commands. */ -package gov.nist.secauto.oscal.tools.cli.core.commands.metaschema; +package dev.metaschema.oscal.tools.cli.core.commands.metaschema; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/ConvertSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/ConvertSubcommand.java similarity index 63% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/ConvertSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/ConvertSubcommand.java index c3c7fcb2..db22ccd8 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/ConvertSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/ConvertSubcommand.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.poam; +package dev.metaschema.oscal.tools.cli.core.commands.poam; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.oscal.lib.model.PlanOfActionAndMilestones; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ConvertCommand; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.oscal.lib.model.PlanOfActionAndMilestones; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ConvertCommand; /** * Provides an OSCAL content conversion command. diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/PlanOfActionsAndMilestonesCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/PlanOfActionsAndMilestonesCommand.java similarity index 84% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/PlanOfActionsAndMilestonesCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/PlanOfActionsAndMilestonesCommand.java index a27955c9..9ebe191a 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/PlanOfActionsAndMilestonesCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/PlanOfActionsAndMilestonesCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.poam; +package dev.metaschema.oscal.tools.cli.core.commands.poam; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to an OSCAL diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/ValidateSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/ValidateSubcommand.java similarity index 66% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/ValidateSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/ValidateSubcommand.java index e72df5df..e9620935 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/poam/ValidateSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/poam/ValidateSubcommand.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.poam; +package dev.metaschema.oscal.tools.cli.core.commands.poam; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ConvertSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ConvertSubcommand.java similarity index 58% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ConvertSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ConvertSubcommand.java index c16fb22f..37aaa53f 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ConvertSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ConvertSubcommand.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.profile; +package dev.metaschema.oscal.tools.cli.core.commands.profile; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.oscal.lib.model.Profile; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.oscal.lib.model.Profile; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; class ConvertSubcommand extends AbstractOscalConvertCommand { diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ProfileCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ProfileCommand.java similarity index 83% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ProfileCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ProfileCommand.java index f410f722..89168103 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ProfileCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ProfileCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.profile; +package dev.metaschema.oscal.tools.cli.core.commands.profile; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to an OSCAL diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ResolveSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ResolveSubcommand.java similarity index 73% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ResolveSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ResolveSubcommand.java index 24bfb592..6fd6637b 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ResolveSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ResolveSubcommand.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.profile; +package dev.metaschema.oscal.tools.cli.core.commands.profile; -import gov.nist.secauto.metaschema.cli.processor.CallingContext; -import gov.nist.secauto.metaschema.cli.processor.command.CommandExecutionException; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractResolveCommand; +import dev.metaschema.cli.processor.CallingContext; +import dev.metaschema.cli.processor.command.CommandExecutionException; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractResolveCommand; import org.apache.commons.cli.CommandLine; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ValidateSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ValidateSubcommand.java similarity index 65% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ValidateSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ValidateSubcommand.java index 9dd57643..a77367c6 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/profile/ValidateSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/profile/ValidateSubcommand.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.profile; +package dev.metaschema.oscal.tools.cli.core.commands.profile; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/ConvertSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/ConvertSubcommand.java similarity index 63% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/ConvertSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/ConvertSubcommand.java index 31a5219e..f74cfb61 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/ConvertSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/ConvertSubcommand.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.ssp; +package dev.metaschema.oscal.tools.cli.core.commands.ssp; -import gov.nist.secauto.metaschema.core.model.IBoundObject; -import gov.nist.secauto.oscal.lib.model.SystemSecurityPlan; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; -import gov.nist.secauto.oscal.tools.cli.core.commands.ConvertCommand; +import dev.metaschema.core.model.IBoundObject; +import dev.metaschema.oscal.lib.model.SystemSecurityPlan; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractOscalConvertCommand; +import dev.metaschema.oscal.tools.cli.core.commands.ConvertCommand; /** * Provides an OSCAL content conversion command. diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/SystemSecurityPlanCommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/SystemSecurityPlanCommand.java similarity index 84% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/SystemSecurityPlanCommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/SystemSecurityPlanCommand.java index f677aab2..3fd7e4c1 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/SystemSecurityPlanCommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/SystemSecurityPlanCommand.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.ssp; +package dev.metaschema.oscal.tools.cli.core.commands.ssp; -import gov.nist.secauto.metaschema.cli.processor.command.AbstractParentCommand; +import dev.metaschema.cli.processor.command.AbstractParentCommand; /** * A parent command implementation that organizes commands related to an OSCAL diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/ValidateSubcommand.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/ValidateSubcommand.java similarity index 65% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/ValidateSubcommand.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/ValidateSubcommand.java index 622f4f9c..4c3bf23f 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/commands/ssp/ValidateSubcommand.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/commands/ssp/ValidateSubcommand.java @@ -3,16 +3,16 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands.ssp; +package dev.metaschema.oscal.tools.cli.core.commands.ssp; -import gov.nist.secauto.metaschema.core.model.util.JsonUtil; -import gov.nist.secauto.metaschema.core.model.util.XmlUtil; -import gov.nist.secauto.metaschema.core.model.validation.JsonSchemaContentValidator; -import gov.nist.secauto.metaschema.core.model.validation.XmlSchemaContentValidator; -import gov.nist.secauto.metaschema.core.util.CollectionUtil; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; +import dev.metaschema.core.model.util.JsonUtil; +import dev.metaschema.core.model.util.XmlUtil; +import dev.metaschema.core.model.validation.JsonSchemaContentValidator; +import dev.metaschema.core.model.validation.XmlSchemaContentValidator; +import dev.metaschema.core.util.CollectionUtil; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.tools.cli.core.commands.AbstractDeprecatedOscalValidationSubcommand; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/utils/PrettyPrinter.java b/src/main/java/dev/metaschema/oscal/tools/cli/core/utils/PrettyPrinter.java similarity index 94% rename from src/main/java/gov/nist/secauto/oscal/tools/cli/core/utils/PrettyPrinter.java rename to src/main/java/dev/metaschema/oscal/tools/cli/core/utils/PrettyPrinter.java index 3fbb60de..01eba190 100644 --- a/src/main/java/gov/nist/secauto/oscal/tools/cli/core/utils/PrettyPrinter.java +++ b/src/main/java/dev/metaschema/oscal/tools/cli/core/utils/PrettyPrinter.java @@ -3,12 +3,12 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.utils; +package dev.metaschema.oscal.tools.cli.core.utils; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import net.sf.saxon.TransformerFactoryImpl; +import javax.xml.transform.TransformerFactory; import org.w3c.dom.Document; @@ -89,7 +89,7 @@ public static void prettyPrintXml(@NonNull File file) Document doc = DocumentBuilderFactory.newInstance() .newDocumentBuilder().parse(file); - TransformerFactoryImpl transformerFactory = new TransformerFactoryImpl(); + TransformerFactory transformerFactory = TransformerFactory.newInstance(); Transformer transformer = transformerFactory.newTransformer(); transformer.setOutputProperty(OutputKeys.INDENT, "yes"); diff --git a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/CLITest.java b/src/test/java/dev/metaschema/oscal/tools/cli/core/CLITest.java similarity index 97% rename from src/test/java/gov/nist/secauto/oscal/tools/cli/core/CLITest.java rename to src/test/java/dev/metaschema/oscal/tools/cli/core/CLITest.java index 129fb740..772292ce 100644 --- a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/CLITest.java +++ b/src/test/java/dev/metaschema/oscal/tools/cli/core/CLITest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core; +package dev.metaschema.oscal.tools.cli.core; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,11 +12,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.cli.processor.ExitCode; -import gov.nist.secauto.metaschema.cli.processor.ExitStatus; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException; +import dev.metaschema.cli.processor.ExitCode; +import dev.metaschema.cli.processor.ExitStatus; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.Format; +import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; diff --git a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/NullYamlValuesTest.java b/src/test/java/dev/metaschema/oscal/tools/cli/core/NullYamlValuesTest.java similarity index 88% rename from src/test/java/gov/nist/secauto/oscal/tools/cli/core/NullYamlValuesTest.java rename to src/test/java/dev/metaschema/oscal/tools/cli/core/NullYamlValuesTest.java index f391173a..342ed894 100644 --- a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/NullYamlValuesTest.java +++ b/src/test/java/dev/metaschema/oscal/tools/cli/core/NullYamlValuesTest.java @@ -3,15 +3,15 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core; +package dev.metaschema.oscal.tools.cli.core; import static org.junit.jupiter.api.Assertions.assertTrue; -import gov.nist.secauto.metaschema.core.util.ObjectUtils; -import gov.nist.secauto.metaschema.databind.io.Format; -import gov.nist.secauto.metaschema.databind.io.IBoundLoader; -import gov.nist.secauto.oscal.lib.OscalBindingContext; -import gov.nist.secauto.oscal.lib.model.AssessmentResults; +import dev.metaschema.core.util.ObjectUtils; +import dev.metaschema.databind.io.Format; +import dev.metaschema.databind.io.IBoundLoader; +import dev.metaschema.oscal.lib.OscalBindingContext; +import dev.metaschema.oscal.lib.model.AssessmentResults; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java b/src/test/java/dev/metaschema/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java similarity index 69% rename from src/test/java/gov/nist/secauto/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java rename to src/test/java/dev/metaschema/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java index 3afe89f2..e92724b1 100644 --- a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java +++ b/src/test/java/dev/metaschema/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.commands; +package dev.metaschema.oscal.tools.cli.core.commands; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,42 +17,42 @@ class Issue96ClassLoaderTest { @Test void testAssessmentPlanClassLoader() { AbstractOscalConvertCommand subcommand - = new gov.nist.secauto.oscal.tools.cli.core.commands.assessmentplan.ConvertSubcommand(); + = new dev.metaschema.oscal.tools.cli.core.commands.assessmentplan.ConvertSubcommand(); assertEquals("AssessmentPlan", subcommand.getOscalClass().getSimpleName()); } @Test void testAssessmentResultsClassLoader() { AbstractOscalConvertCommand subcommand - = new gov.nist.secauto.oscal.tools.cli.core.commands.assessmentresults.ConvertSubcommand(); + = new dev.metaschema.oscal.tools.cli.core.commands.assessmentresults.ConvertSubcommand(); assertEquals("AssessmentResults", subcommand.getOscalClass().getSimpleName()); } @Test void testCatalogClassLoader() { AbstractOscalConvertCommand subcommand - = new gov.nist.secauto.oscal.tools.cli.core.commands.catalog.ConvertSubcommand(); + = new dev.metaschema.oscal.tools.cli.core.commands.catalog.ConvertSubcommand(); assertEquals("Catalog", subcommand.getOscalClass().getSimpleName()); } @Test void testPoamClassLoader() { AbstractOscalConvertCommand subcommand - = new gov.nist.secauto.oscal.tools.cli.core.commands.poam.ConvertSubcommand(); + = new dev.metaschema.oscal.tools.cli.core.commands.poam.ConvertSubcommand(); assertEquals("PlanOfActionAndMilestones", subcommand.getOscalClass().getSimpleName()); } @Test void testSspClassLoader() { AbstractOscalConvertCommand subcommand - = new gov.nist.secauto.oscal.tools.cli.core.commands.ssp.ConvertSubcommand(); + = new dev.metaschema.oscal.tools.cli.core.commands.ssp.ConvertSubcommand(); assertEquals("SystemSecurityPlan", subcommand.getOscalClass().getSimpleName()); } @Test void testComponentDefinitionClassLoader() { AbstractOscalConvertCommand subcommand - = new gov.nist.secauto.oscal.tools.cli.core.commands.componentdefinition.ConvertSubcommand(); + = new dev.metaschema.oscal.tools.cli.core.commands.componentdefinition.ConvertSubcommand(); assertEquals("ComponentDefinition", subcommand.getOscalClass().getSimpleName()); } } diff --git a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/utils/PrettyPrinterTest.java b/src/test/java/dev/metaschema/oscal/tools/cli/core/utils/PrettyPrinterTest.java similarity index 98% rename from src/test/java/gov/nist/secauto/oscal/tools/cli/core/utils/PrettyPrinterTest.java rename to src/test/java/dev/metaschema/oscal/tools/cli/core/utils/PrettyPrinterTest.java index 6c52eaf7..985ead0f 100644 --- a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/utils/PrettyPrinterTest.java +++ b/src/test/java/dev/metaschema/oscal/tools/cli/core/utils/PrettyPrinterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: CC0-1.0 */ -package gov.nist.secauto.oscal.tools.cli.core.utils; +package dev.metaschema.oscal.tools.cli.core.utils; import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;