Merge pull request #31 from metaschema-framework/feature/simplify-exe…

…cutor

use cli directly instead of making new executor

Dockerfile

@@ -5,7 +5,6 @@ FROM eclipse-temurin:17-jdk-focal
 
 # Set environment variables
 ENV VERTICLE_NAME=gov.nist.secauto.oscal.tools.server.OscalVerticle
-ENV VERTICLE_FILE=server-1.0.0-SNAPSHOT.jar
 ENV APP_HOME /usr/app
 
 # Create the application directory

dependency-reduced-pom.xml

@@ -279,7 +279,7 @@
     <dependency>
       <groupId>dev.metaschema.oscal</groupId>
       <artifactId>oscal-cli-enhanced</artifactId>
-      <version>2.2.0</version>
+      <version>2.3.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -291,7 +291,7 @@
     <dependency>
       <groupId>dev.metaschema.java</groupId>
       <artifactId>cli-processor</artifactId>
-      <version>1.2.0</version>
+      <version>2.0.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -303,7 +303,7 @@
     <dependency>
       <groupId>dev.metaschema.java</groupId>
       <artifactId>metaschema-cli</artifactId>
-      <version>1.2.0</version>
+      <version>2.0.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -315,7 +315,7 @@
     <dependency>
       <groupId>dev.metaschema.java</groupId>
       <artifactId>metaschema-schema-generator</artifactId>
-      <version>1.2.0</version>
+      <version>2.0.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -327,7 +327,7 @@
     <dependency>
       <groupId>dev.metaschema.oscal</groupId>
       <artifactId>liboscal-java</artifactId>
-      <version>4.2.0</version>
+      <version>5.0.0</version>
       <scope>compile</scope>
       <exclusions>
         <exclusion>
@@ -409,13 +409,13 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
     <vertx.version>4.5.10</vertx.version>
-    <metaschema-framework.version>1.2.0</metaschema-framework.version>
+    <metaschema-framework.version>2.0.0</metaschema-framework.version>
     <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-    <liboscal-java.version>4.2.0</liboscal-java.version>
+    <liboscal-java.version>5.0.0</liboscal-java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <oscal-cli.version>2.2.0</oscal-cli.version>
+    <oscal-cli.version>2.3.0</oscal-cli.version>
     <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>
     <swid-maven-plugin.version>0.7.0</swid-maven-plugin.version>
     <dependency.log4j2.version>2.24.1</dependency.log4j2.version>

pom.xml

@@ -23,9 +23,9 @@
 
     <vertx.version>4.5.10</vertx.version>
     <swid-maven-plugin.version>0.7.0</swid-maven-plugin.version>
-    <oscal-cli.version>2.2.0</oscal-cli.version>
-    <metaschema-framework.version>1.2.0</metaschema-framework.version>
-    <liboscal-java.version>4.2.0</liboscal-java.version>
+    <oscal-cli.version>2.3.0</oscal-cli.version>
+    <metaschema-framework.version>2.0.0</metaschema-framework.version>
+    <liboscal-java.version>5.0.0</liboscal-java.version>
     <java.version>11</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>