From 16101e8c6a6b277dfa351c14bf4e289ca88a3fa0 Mon Sep 17 00:00:00 2001
From: Gary O'Neall <gary@sourceauditor.com>
Date: Mon, 6 Oct 2025 11:27:50 -0700
Subject: [PATCH] Update JavaDocs config

Fixes #229

Also updates the Verify.java file to remove JavaDoc warnings and a few
other minor cleanups
---
 pom.xml                                  | 10 +++-------
 src/main/java/org/spdx/tools/Verify.java | 11 ++++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index ddbfbbc..79fede0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,19 +253,15 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.4</version>
+				<version>3.11.3</version>
 				<configuration>
 					<quiet>true</quiet>
-					<source>8</source>
-					<javadocExecutable>${env.JAVA_HOME}/bin/javadoc</javadocExecutable>
-					<additionalparam>-Xdoclint:none</additionalparam>
+					<notimestamp>true</notimestamp>
+					<doclint>all,-missing</doclint>
 				</configuration>
 				<executions>
 					<execution>
 						<id>attach-javadocs</id>
-						<configuration>
-							<additionalparam>${javadoc.opts}</additionalparam>
-						</configuration>
 						<goals>
 							<goal>jar</goal>
 						</goals>
diff --git a/src/main/java/org/spdx/tools/Verify.java b/src/main/java/org/spdx/tools/Verify.java
index 0942914..d4d050d 100644
--- a/src/main/java/org/spdx/tools/Verify.java
+++ b/src/main/java/org/spdx/tools/Verify.java
@@ -70,7 +70,7 @@ public static void main(String[] args) {
 			System.exit(ERROR_STATUS);
 		}
 		if (args.length > MAX_ARGS) {
-			System.out.printf("Warning: Extra arguments will be ignored");
+			System.out.println("Warning: Extra arguments will be ignored");
 		}
 		SpdxToolsHelper.initialize();
 		List<String> verify = null;
@@ -104,20 +104,20 @@ public static void main(String[] args) {
 				errors.add(verifyMsg);
 			}
 		}
-		if (errors.size() > 0) {
+		if (!errors.isEmpty()) {
 			System.out.println("This SPDX Document is not valid due to:");
 			for (String errorMsg:errors) {
 				System.out.print("\t" + errorMsg+"\n");
 			}
 		}
-		if (warnings.size() > 0) {
+		if (!warnings.isEmpty()) {
 			System.out.println("Warning: Deprecated license identifiers were found that should no longer be used.\n"
 					+ "References to the following deprecated license ID's should be updated:");
 			for (String warningMsg:warnings) {
 				System.out.print("\t" + warningMsg+"\n");
 			}
 		}
-		if (errors.size() == 0) {
+		if (errors.isEmpty()) {
 			System.out.println("This SPDX Document is valid.");
 		} else {
 			System.exit(ERROR_STATUS);
@@ -127,10 +127,7 @@ public static void main(String[] args) {
 	/**
 	 * Verify a an SPDX file
 	 * @param filePath File path to the SPDX file to be verified
-	 * @param fileType 
 	 * @return A list of verification errors - if empty, the SPDX file is valid
-	 * @throws InvalidFileNameException on invalid file name or file not found
-	 * @throws IOException on IO error
 	 * @throws SpdxVerificationException where the SPDX file can not be parsed or the filename is invalid
 	 */
 	public static List<String> verify(String filePath, SerFileType fileType) throws SpdxVerificationException {