Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 4 additions & 7 deletions src/main/java/org/spdx/tools/Verify.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -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 {
Expand Down