Skip to content

Commit

Permalink
Fixed an issue with the website deployment that causes the subdomain …
Browse files Browse the repository at this point in the history
…to unconfigure. Removed unused code that was transitioned to metaschema-java. Bumnped metaschema-java to the 1.0.2 release.
  • Loading branch information
david-waltermire committed Aug 19, 2024
1 parent d0ad4cd commit 2c6fb9f
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 278 deletions.
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@ jobs:
- name: Run deploy script
run: |
touch target/staging/.nojekyll
echo "liboscal-java.metaschema.dev" > target/staging/CNAME
bash .github/workflows/deploy.sh --push-only -v -m "Deploying website [ci skip]"
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,21 @@
<project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<dependency.metaschema-framework.version>1.0.1</dependency.metaschema-framework.version>
<dependency.metaschema-framework.version>1.0.2</dependency.metaschema-framework.version>

<dependency.auto-service.version>1.1.1</dependency.auto-service.version>
<dependency.commons-lang3.version>3.15.0</dependency.commons-lang3.version>
<dependency.infinispan.version>13.0.10.Final</dependency.infinispan.version>
<dependency.jmock-junit5.version>2.13.1</dependency.jmock-junit5.version>
<dependency.log4j2.version>2.23.1</dependency.log4j2.version>
<dependency.saxon.version>12.4</dependency.saxon.version>
<dependency.spotbugs-annotations.version>4.8.3</dependency.spotbugs-annotations.version>
<dependency.spotbugs-annotations.version>4.8.6</dependency.spotbugs-annotations.version>
<dependency.xmlbeans.version>5.2.1</dependency.xmlbeans.version>
<dependency.xmlresolver.version>6.0.4</dependency.xmlresolver.version>
<dependency.xmlunit.version>2.10.0</dependency.xmlunit.version>

<plugin.cyclonedx.version>2.7.11</plugin.cyclonedx.version>
<plugin.maven-toolchains.version>3.2.0</plugin.maven-toolchains.version>
<plugin.maven-toolchains.version>3.2.0</plugin.maven-toolchains.version>

<cyclonedx.schema.version>1.3</cyclonedx.schema.version>
<oscal-content.commit>main</oscal-content.commit>
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@

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

import gov.nist.secauto.metaschema.core.metapath.item.node.AbstractRecursionPreventingNodeItemVisitor;
import gov.nist.secauto.metaschema.core.metapath.item.node.IDefinitionNodeItem;
import gov.nist.secauto.metaschema.core.metapath.item.node.INodeItemFactory;
import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValue;
import gov.nist.secauto.metaschema.core.model.constraint.IAllowedValuesConstraint;
import gov.nist.secauto.metaschema.databind.model.IBoundModule;
Expand All @@ -17,14 +15,11 @@

import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.io.PrintWriter;
import java.util.Comparator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
import java.util.Set;
import java.util.TreeMap;
import java.util.function.Function;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -91,46 +86,4 @@ private static <K, V> NavigableMap<K, V> sortMap(@NonNull Map<K, V> map, @NonNul
return retval;
}

@Test
void testAssemblyRecursion() {
IBoundModule module = OscalBindingContext.instance().registerModule(OscalCompleteModule.class);
RecursionCollectingNodeItemVisitor walker = new RecursionCollectingNodeItemVisitor();
walker.visit(module);
Set<RecursionCollectingNodeItemVisitor.AssemblyRecord> recursiveAssemblies
= walker.getRecursiveAssemblyDefinitions();

System.out.println("Recursive Assemblies");
System.out.println("--------------------");
recursiveAssemblies.forEach(record -> {
System.out.println(record.getDefinition().getFormalName());
record.getLocations().forEach(location -> {
System.out.println("- " + metapath(location));
});
});
}

@Test
void testRecursion() {
AbstractRecursionPreventingNodeItemVisitor<Void, Void> visitor
= new AbstractRecursionPreventingNodeItemVisitor<>() {
@Override
protected Void defaultResult() {
return null;
}
};

IBoundModule module = OscalBindingContext.instance().registerModule(OscalCompleteModule.class);
visitor.visitMetaschema(INodeItemFactory.instance().newModuleNodeItem(module), null);
}

@Test
void testErDiagram() throws IOException {
MermaidErDiagramGenerator visitor = new MermaidErDiagramGenerator();

IBoundModule module = OscalBindingContext.instance().registerModule(OscalCompleteModule.class);

try (PrintWriter writer = new PrintWriter(System.out)) {
visitor.generate(module, writer);
}
}
}

0 comments on commit 2c6fb9f

Please sign in to comment.