Reduced unneeded dependencies.

usnistgov · Oct 19, 2023 · d81ad89 · d81ad89
1 parent d395f29
commit d81ad89
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -113,6 +113,7 @@
 		<dependency.commons-io.version>2.14.0</dependency.commons-io.version>
 		<dependency.everit-json.version>1.14.3</dependency.everit-json.version>
 		<dependency.jline.version>3.21.0</dependency.jline.version>
+		<dependency.json.version>20230618</dependency.json.version>
 		<dependency.log4j2.version>2.20.0</dependency.log4j2.version>
 		<dependency.spotbugs-annotations.version>4.7.3</dependency.spotbugs-annotations.version>
 		<dependency.saxon-he.version>12.3</dependency.saxon-he.version>
@@ -220,6 +221,12 @@
 			<artifactId>everit-json-schema</artifactId>
 			<version>${dependency.everit-json.version}</version>
 		</dependency>
+		<dependency>
+			<!-- for dependency convergence -->
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>${dependency.json.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>com.github.spotbugs</groupId>
 			<artifactId>spotbugs-annotations</artifactId>
@@ -312,8 +319,7 @@
 							<addClasspath>true</addClasspath>
 							<!-- <classpathPrefix>lib/</classpathPrefix> -->
 							<classpathLayoutType>custom</classpathLayoutType>
-							<customClasspathLayout>
-								${artifact.groupId}.${artifact.artifactId}-$${artifact.version}.${artifact.extension}</customClasspathLayout>
+							<customClasspathLayout>${artifact.groupId}.${artifact.artifactId}-$${artifact.version}.${artifact.extension}</customClasspathLayout>
 						</manifest>
 					</archive>
 				</configuration>
@@ -332,10 +338,8 @@
 					<generateRepository>false</generateRepository>
 					<repositoryLayout>flat</repositoryLayout>
 					<repositoryName>lib</repositoryName>
-					<outputFileNameMapping>
-						@{groupId}@.@{artifactId}@-@{version}@.@{extension}@</outputFileNameMapping>
-					<extraJvmArguments>-Dsun.stdout.encoding=UTF-8
-						-Dsun.stderr.encoding=UTF-8</extraJvmArguments>
+					<outputFileNameMapping>@{groupId}@.@{artifactId}@-@{version}@.@{extension}@</outputFileNameMapping>
+					<extraJvmArguments>-Dsun.stdout.encoding=UTF-8 -Dsun.stderr.encoding=UTF-8</extraJvmArguments>
 					<projectArtifactFirstInClassPath>true</projectArtifactFirstInClassPath>
 					<includeConfigurationDirectoryInClasspath>false</includeConfigurationDirectoryInClasspath>
 				</configuration>
@@ -413,14 +417,10 @@
 							<goal>add-third-party</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>
-								${project.build.directory}/generated-distro</outputDirectory>
+							<outputDirectory>${project.build.directory}/generated-distro</outputDirectory>
 							<thirdPartyFilename>LICENSE-THIRD-PARTY.txt</thirdPartyFilename>
 							<licenseMerges>
-								<licenseMerge>The Apache Software License,
-									Version 2.0|Apache
-									License, Version 2.0|Apache Public License
-									2.0</licenseMerge>
+								<licenseMerge>The Apache Software License, Version 2.0|Apache License, Version 2.0|Apache Public License 2.0</licenseMerge>
 							</licenseMerges>
 						</configuration>
 					</execution>

diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
@@ -14,6 +14,9 @@
 			<outputDirectory>/lib</outputDirectory>
 			<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
 			<useProjectArtifact>true</useProjectArtifact>
+			<excludes>
+				<exclude>org.jetbrains:annotations</exclude>
+			</excludes>
 		</dependencySet>
 	</dependencySets>
 	<fileSets>

diff --git a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/NullYamlValuesTest.java b/src/test/java/gov/nist/secauto/oscal/tools/cli/core/NullYamlValuesTest.java
@@ -53,7 +53,8 @@ static void initialize() {
   @SuppressWarnings("null")
   @Test
   void testLoadYamlNullVar1() throws IOException {
-    // the YAML catalog is currently malformed, this will create a proper one for this test
+    // the YAML catalog is currently malformed, this will create a proper one for
+    // this test
     AssessmentResults data
         = loader.load(
             ObjectUtils.requireNonNull(Paths.get("src/test/resources/yaml-null/example_ar_nullvar-1.yaml")));
@@ -68,7 +69,8 @@ void testLoadYamlNullVar1() throws IOException {
   @SuppressWarnings("null")
   @Test
   void testLoadYamlNullVar2() throws IOException {
-    // the YAML catalog is currently malformed, this will create a proper one for this test
+    // the YAML catalog is currently malformed, this will create a proper one for
+    // this test
     AssessmentResults data
         = loader.load(
             ObjectUtils.requireNonNull(Paths.get("src/test/resources/yaml-null/example_ar_nullvar-2.yaml")));
@@ -83,7 +85,8 @@ void testLoadYamlNullVar2() throws IOException {
   @SuppressWarnings("null")
   @Test
   void testLoadYamlNullVar3() throws IOException {
-    // the YAML catalog is currently malformed, this will create a proper one for this test
+    // the YAML catalog is currently malformed, this will create a proper one for
+    // this test
     AssessmentResults data
         = loader.load(
             ObjectUtils.requireNonNull(Paths.get("src/test/resources/yaml-null/example_ar_nullvar-3.yaml")));

diff --git a/src/test/java/gov/nist/secauto/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java b/src/test/java/gov/nist/secauto/oscal/tools/cli/core/commands/Issue96ClassLoaderTest.java
@@ -34,8 +34,8 @@
 
 class Issue96ClassLoaderTest {
   /**
-   * Regression tests for usnistgov/oscal-cli#96. See information at this URL for more details.
-   * https://github.com/usnistgov/oscal-cli/issues/96
+   * Regression tests for usnistgov/oscal-cli#96. See information at this URL for
+   * more details. https://github.com/usnistgov/oscal-cli/issues/96
    */
   @Test
   void testAssessmentPlanClassLoader() {