Skip to content

refactor!: rename all packages to dev.metaschema namespace #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-waltermire merged 5 commits into from
Jan 6, 2026
Merged

refactor!: rename all packages to dev.metaschema namespace #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e5e92e
build: add .worktrees/ to .gitignore for isolated development
david-waltermire Jan 6, 2026
968c5c7
refactor: update imports for metaschema-java package rename
david-waltermire Jan 6, 2026
da2c77d
refactor!: rename packages from gov.nist.secauto.oscal to dev.metasch…
david-waltermire Jan 6, 2026
f1d56cf
chore: remove unused dependencies and update versions
david-waltermire Jan 6, 2026
bf30195
fix: resolve SpotBugs warnings for redundant null checks
david-waltermire Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ velocity.log*

# Claude
CLAUDE.local.md

# Git worktrees
.worktrees/
40 changes: 4 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<groupId>dev.metaschema.oscal</groupId>
<artifactId>liboscal-java</artifactId>
<version>6.1.0-SNAPSHOT</version>
<version>7.0.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>OSCAL Java Library</name>
Expand Down Expand Up @@ -93,15 +93,13 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<dependency.metaschema-framework.version>3.0.0.M1</dependency.metaschema-framework.version>
<dependency.metaschema-framework.version>3.0.0-SNAPSHOT</dependency.metaschema-framework.version>

<dependency.commons-lang3.version>3.20.0</dependency.commons-lang3.version>
<dependency.jmock-junit5.version>2.13.1</dependency.jmock-junit5.version>
<dependency.lazy4j.version>2.0.3</dependency.lazy4j.version>
<dependency.log4j2.version>2.25.2</dependency.log4j2.version>
<dependency.saxon.version>12.9</dependency.saxon.version>
<dependency.xmlbeans.version>5.3.0</dependency.xmlbeans.version>
<dependency.xmlresolver.version>6.0.19</dependency.xmlresolver.version>
<dependency.log4j2.version>2.25.3</dependency.log4j2.version>
<dependency.saxon.version>12.5</dependency.saxon.version>
<dependency.xmlunit.version>2.11.0</dependency.xmlunit.version>

<plugin.cyclonedx.version>2.9.1</plugin.cyclonedx.version>
Expand Down Expand Up @@ -170,36 +168,6 @@
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.xmlresolver</groupId>
<artifactId>xmlresolver</artifactId>
<version>${dependency.xmlresolver.version}</version>
<classifier>data</classifier>
<exclusions>
<exclusion>
<!-- to avoid duplicate import of XML APIs -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.xmlresolver</groupId>
<artifactId>xmlresolver</artifactId>
<version>${dependency.xmlresolver.version}</version>
<exclusions>
<exclusion>
<!-- to avoid duplicate import of XML APIs -->
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${dependency.xmlbeans.version}</version>
</dependency>

<dependency>
<groupId>org.junit</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...st/secauto/oscal/lib/LibOscalVersion.java → ...metaschema/oscal/lib/LibOscalVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib;
package dev.metaschema.oscal.lib;

import gov.nist.secauto.metaschema.core.util.IVersionInfo;
import dev.metaschema.core.util.IVersionInfo;

/**
* Provides version information for this library.
Expand Down
4 changes: 2 additions & 2 deletions .../nist/secauto/oscal/lib/OscalVersion.java → ...ev/metaschema/oscal/lib/OscalVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib;
package dev.metaschema.oscal.lib;

import gov.nist.secauto.metaschema.core.util.IVersionInfo;
import dev.metaschema.core.util.IVersionInfo;

/**
* Provides version information for the underlying OSCAL implementation used by this library.
Expand Down
32 changes: 16 additions & 16 deletions ...ecauto/oscal/lib/OscalBindingContext.java → ...schema/oscal/lib/OscalBindingContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib;

import gov.nist.secauto.metaschema.core.metapath.StaticContext;
import gov.nist.secauto.metaschema.core.model.MetaschemaException;
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
import gov.nist.secauto.metaschema.databind.DefaultBindingContext;
import gov.nist.secauto.metaschema.databind.IBindingContext;
import gov.nist.secauto.metaschema.databind.SimpleModuleLoaderStrategy;
import gov.nist.secauto.oscal.lib.model.AssessmentPlan;
import gov.nist.secauto.oscal.lib.model.AssessmentResults;
import gov.nist.secauto.oscal.lib.model.Catalog;
import gov.nist.secauto.oscal.lib.model.ComponentDefinition;
import gov.nist.secauto.oscal.lib.model.OscalCompleteModule;
import gov.nist.secauto.oscal.lib.model.PlanOfActionAndMilestones;
import gov.nist.secauto.oscal.lib.model.Profile;
import gov.nist.secauto.oscal.lib.model.SystemSecurityPlan;
package dev.metaschema.oscal.lib;

import dev.metaschema.core.metapath.StaticContext;
import dev.metaschema.core.model.MetaschemaException;
import dev.metaschema.core.util.ObjectUtils;
import dev.metaschema.databind.DefaultBindingContext;
import dev.metaschema.databind.IBindingContext;
import dev.metaschema.databind.SimpleModuleLoaderStrategy;
import dev.metaschema.oscal.lib.model.AssessmentPlan;
import dev.metaschema.oscal.lib.model.AssessmentResults;
import dev.metaschema.oscal.lib.model.Catalog;
import dev.metaschema.oscal.lib.model.ComponentDefinition;
import dev.metaschema.oscal.lib.model.OscalCompleteModule;
import dev.metaschema.oscal.lib.model.PlanOfActionAndMilestones;
import dev.metaschema.oscal.lib.model.Profile;
import dev.metaschema.oscal.lib.model.SystemSecurityPlan;

import java.io.File;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions ...ecauto/oscal/lib/OscalModelConstants.java → ...schema/oscal/lib/OscalModelConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib;
package dev.metaschema.oscal.lib;

import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
import dev.metaschema.core.qname.IEnhancedQName;

import edu.umd.cs.findbugs.annotations.NonNull;

Expand Down
8 changes: 4 additions & 4 deletions ...ov/nist/secauto/oscal/lib/OscalUtils.java → .../dev/metaschema/oscal/lib/OscalUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib;
package dev.metaschema.oscal.lib;

import gov.nist.secauto.metaschema.core.util.ObjectUtils;
import gov.nist.secauto.oscal.lib.model.BackMatter.Resource;
import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Rlink;
import dev.metaschema.core.util.ObjectUtils;
import dev.metaschema.oscal.lib.model.BackMatter.Resource;
import dev.metaschema.oscal.lib.model.BackMatter.Resource.Rlink;

import java.net.URI;
import java.util.List;
Expand Down
44 changes: 22 additions & 22 deletions ...h/function/library/HasOscalNamespace.java → ...h/function/library/HasOscalNamespace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib.metapath.function.library;

import gov.nist.secauto.metaschema.core.metapath.ContextAbsentDynamicMetapathException;
import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
import gov.nist.secauto.metaschema.core.metapath.function.InvalidTypeFunctionException;
import gov.nist.secauto.metaschema.core.metapath.item.IItem;
import gov.nist.secauto.metaschema.core.metapath.item.ISequence;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IBooleanItem;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.IAssemblyNodeItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.IFlagNodeItem;
import gov.nist.secauto.metaschema.core.model.IAssemblyDefinition;
import gov.nist.secauto.metaschema.core.model.IFlagInstance;
import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
import gov.nist.secauto.oscal.lib.OscalModelConstants;
import gov.nist.secauto.oscal.lib.model.metadata.IProperty;
package dev.metaschema.oscal.lib.metapath.function.library;

import dev.metaschema.core.metapath.ContextAbsentDynamicMetapathException;
import dev.metaschema.core.metapath.DynamicContext;
import dev.metaschema.core.metapath.MetapathConstants;
import dev.metaschema.core.metapath.function.FunctionUtils;
import dev.metaschema.core.metapath.function.IArgument;
import dev.metaschema.core.metapath.function.IFunction;
import dev.metaschema.core.metapath.function.InvalidTypeFunctionException;
import dev.metaschema.core.metapath.item.IItem;
import dev.metaschema.core.metapath.item.ISequence;
import dev.metaschema.core.metapath.item.atomic.IAnyUriItem;
import dev.metaschema.core.metapath.item.atomic.IBooleanItem;
import dev.metaschema.core.metapath.item.atomic.IStringItem;
import dev.metaschema.core.metapath.item.node.IAssemblyNodeItem;
import dev.metaschema.core.metapath.item.node.IFlagNodeItem;
import dev.metaschema.core.model.IAssemblyDefinition;
import dev.metaschema.core.model.IFlagInstance;
import dev.metaschema.core.qname.IEnhancedQName;
import dev.metaschema.core.util.ObjectUtils;
import dev.metaschema.oscal.lib.OscalModelConstants;
import dev.metaschema.oscal.lib.model.metadata.IProperty;

import java.net.URI;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...unction/library/OscalFunctionLibrary.java → ...unction/library/OscalFunctionLibrary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib.metapath.function.library;
package dev.metaschema.oscal.lib.metapath.function.library;

import gov.nist.secauto.metaschema.core.metapath.function.FunctionLibrary;
import dev.metaschema.core.metapath.function.FunctionLibrary;

public class OscalFunctionLibrary
extends FunctionLibrary {
Expand Down
40 changes: 20 additions & 20 deletions ...path/function/library/ResolveProfile.java → ...path/function/library/ResolveProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib.metapath.function.library;

import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
import gov.nist.secauto.metaschema.core.metapath.MetapathConstants;
import gov.nist.secauto.metaschema.core.metapath.function.DocumentFunctionException;
import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
import gov.nist.secauto.metaschema.core.metapath.function.library.FnDoc;
import gov.nist.secauto.metaschema.core.metapath.function.library.FnResolveUri;
import gov.nist.secauto.metaschema.core.metapath.item.IItem;
import gov.nist.secauto.metaschema.core.metapath.item.ISequence;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
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.oscal.lib.OscalModelConstants;
import gov.nist.secauto.oscal.lib.model.Catalog;
import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolutionException;
import gov.nist.secauto.oscal.lib.profile.resolver.ProfileResolver;
package dev.metaschema.oscal.lib.metapath.function.library;

import dev.metaschema.core.metapath.DynamicContext;
import dev.metaschema.core.metapath.MetapathConstants;
import dev.metaschema.core.metapath.function.DocumentFunctionException;
import dev.metaschema.core.metapath.function.FunctionUtils;
import dev.metaschema.core.metapath.function.IArgument;
import dev.metaschema.core.metapath.function.IFunction;
import dev.metaschema.core.metapath.function.library.FnDoc;
import dev.metaschema.core.metapath.function.library.FnResolveUri;
import dev.metaschema.core.metapath.item.IItem;
import dev.metaschema.core.metapath.item.ISequence;
import dev.metaschema.core.metapath.item.atomic.IAnyUriItem;
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.oscal.lib.OscalModelConstants;
import dev.metaschema.oscal.lib.model.Catalog;
import dev.metaschema.oscal.lib.profile.resolver.ProfileResolutionException;
import dev.metaschema.oscal.lib.profile.resolver.ProfileResolver;

import java.io.IOException;
import java.net.URI;
Expand Down
49 changes: 22 additions & 27 deletions ...th/function/library/ResolveReference.java → ...th/function/library/ResolveReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib.metapath.function.library;

import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
import gov.nist.secauto.metaschema.core.metapath.function.FunctionUtils;
import gov.nist.secauto.metaschema.core.metapath.function.IArgument;
import gov.nist.secauto.metaschema.core.metapath.function.IFunction;
import gov.nist.secauto.metaschema.core.metapath.function.InvalidArgumentFunctionException;
import gov.nist.secauto.metaschema.core.metapath.function.UnidentifiedFunctionError;
import gov.nist.secauto.metaschema.core.metapath.function.library.FnRoot;
import gov.nist.secauto.metaschema.core.metapath.item.IItem;
import gov.nist.secauto.metaschema.core.metapath.item.ISequence;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IAnyUriItem;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IStringItem;
import gov.nist.secauto.metaschema.core.metapath.item.atomic.IUuidItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItem;
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
import gov.nist.secauto.oscal.lib.OscalModelConstants;
import gov.nist.secauto.oscal.lib.OscalUtils;
import gov.nist.secauto.oscal.lib.model.BackMatter.Resource;
import gov.nist.secauto.oscal.lib.model.BackMatter.Resource.Rlink;
import gov.nist.secauto.oscal.lib.model.IOscalInstance;
package dev.metaschema.oscal.lib.metapath.function.library;

import dev.metaschema.core.metapath.DynamicContext;
import dev.metaschema.core.metapath.function.FunctionUtils;
import dev.metaschema.core.metapath.function.IArgument;
import dev.metaschema.core.metapath.function.IFunction;
import dev.metaschema.core.metapath.function.InvalidArgumentFunctionException;
import dev.metaschema.core.metapath.function.UnidentifiedFunctionError;
import dev.metaschema.core.metapath.function.library.FnRoot;
import dev.metaschema.core.metapath.item.IItem;
import dev.metaschema.core.metapath.item.ISequence;
import dev.metaschema.core.metapath.item.atomic.IAnyUriItem;
import dev.metaschema.core.metapath.item.atomic.IStringItem;
import dev.metaschema.core.metapath.item.atomic.IUuidItem;
import dev.metaschema.core.metapath.item.node.INodeItem;
import dev.metaschema.core.util.ObjectUtils;
import dev.metaschema.oscal.lib.OscalModelConstants;
import dev.metaschema.oscal.lib.OscalUtils;
import dev.metaschema.oscal.lib.model.BackMatter.Resource;
import dev.metaschema.oscal.lib.model.BackMatter.Resource.Rlink;
import dev.metaschema.oscal.lib.model.IOscalInstance;

import java.net.URI;
import java.util.List;
Expand Down Expand Up @@ -179,11 +179,6 @@ public static URI resolveReference(
throw new UnidentifiedFunctionError(
String.format("The backmatter resource '%s' does not have an rlink entry.", reference));
}
URI retval = rLink.getHref();
if (retval == null) {
throw new UnidentifiedFunctionError(
String.format("The backmatter resource '%s' has an rlink with a null href value.", reference));
}
return retval;
return rLink.getHref();
}
}
6 changes: 3 additions & 3 deletions ...scal/lib/model/AbstractOscalInstance.java → ...scal/lib/model/AbstractOscalInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib.model;
package dev.metaschema.oscal.lib.model;

import gov.nist.secauto.oscal.lib.model.BackMatter.Resource;
import gov.nist.secauto.oscal.lib.model.metadata.IBackMatter;
import dev.metaschema.oscal.lib.model.BackMatter.Resource;
import dev.metaschema.oscal.lib.model.metadata.IBackMatter;

import java.util.UUID;

Expand Down
4 changes: 2 additions & 2 deletions ...cauto/oscal/lib/model/IOscalInstance.java → ...chema/oscal/lib/model/IOscalInstance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib.model;
package dev.metaschema.oscal.lib.model;

import gov.nist.secauto.oscal.lib.model.BackMatter.Resource;
import dev.metaschema.oscal.lib.model.BackMatter.Resource;

import java.util.UUID;

Expand Down
26 changes: 13 additions & 13 deletions .../lib/model/control/AbstractParameter.java → .../lib/model/control/AbstractParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
* SPDX-License-Identifier: CC0-1.0
*/

package gov.nist.secauto.oscal.lib.model.control;

import gov.nist.secauto.metaschema.core.datatype.markup.MarkupLine;
import gov.nist.secauto.metaschema.core.datatype.markup.MarkupMultiline;
import gov.nist.secauto.metaschema.core.util.CollectionUtil;
import gov.nist.secauto.metaschema.core.util.ObjectUtils;
import gov.nist.secauto.oscal.lib.model.Link;
import gov.nist.secauto.oscal.lib.model.Parameter;
import gov.nist.secauto.oscal.lib.model.ParameterConstraint;
import gov.nist.secauto.oscal.lib.model.ParameterGuideline;
import gov.nist.secauto.oscal.lib.model.ParameterSelection;
import gov.nist.secauto.oscal.lib.model.Property;
import gov.nist.secauto.oscal.lib.model.metadata.IProperty;
package dev.metaschema.oscal.lib.model.control;

import dev.metaschema.core.datatype.markup.MarkupLine;
import dev.metaschema.core.datatype.markup.MarkupMultiline;
import dev.metaschema.core.util.CollectionUtil;
import dev.metaschema.core.util.ObjectUtils;
import dev.metaschema.oscal.lib.model.Link;
import dev.metaschema.oscal.lib.model.Parameter;
import dev.metaschema.oscal.lib.model.ParameterConstraint;
import dev.metaschema.oscal.lib.model.ParameterGuideline;
import dev.metaschema.oscal.lib.model.ParameterSelection;
import dev.metaschema.oscal.lib.model.Property;
import dev.metaschema.oscal.lib.model.metadata.IProperty;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
Loading
Loading