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
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ If you are a developer, there are examples in the [examples folder](examples/org

The command line interface of the SPDX Tools can be used like this:

java -jar tools-java-2.0.6-jar-with-dependencies.jar <function> <parameters>
java -jar tools-java-2.0.7-jar-with-dependencies.jar <function> <parameters>

## SPDX format converters

Expand All @@ -54,18 +54,18 @@ The following converter tools support SPDX format:

Example to convert a SPDX file from Tag to RDF format:

java -jar tools-java-2.0.6-jar-with-dependencies.jar Convert ../testResources/SPDXTagExample-v2.2.spdx TagToRDF.rdf
java -jar tools-java-2.0.7-jar-with-dependencies.jar Convert ../testResources/SPDXTagExample-v2.2.spdx TagToRDF.rdf

The file formats can optionally be provided as the 3rd and 4th parameter for the input and output formats respectively. An optional 5th option `excludeLicenseDetails` will not copy the listed license properties to the output file. The following example will copy a JSON format to an RDF Turtle format without including the listed license properties:

java -jar tools-java-2.0.6-jar-with-dependencies.jar Convert ../testResources/SPDXTagExample-v2.2.spdx TagToRDF.ttl TAG RDFTTL excludeLicenseDetails
java -jar tools-java-2.0.7-jar-with-dependencies.jar Convert ../testResources/SPDXTagExample-v2.2.spdx TagToRDF.ttl TAG RDFTTL excludeLicenseDetails

To convert from SPDX 2 to SPDX 3.0.1:

* use the file extension `.spdx3.json` or `.jsonld.json` or `.jsonld`;
* or add the options for the from and to file types:

java -jar tools-java-2.0.6-jar-with-dependencies.jar Convert hello.spdx hello.spdx.json TAG JSONLD
java -jar tools-java-2.0.7-jar-with-dependencies.jar Convert hello.spdx hello.spdx.json TAG JSONLD

## Compare utilities

Expand All @@ -75,13 +75,13 @@ The following tools can be used to compare one or more SPDX documents:

Example to compare multiple SPDX files provided in RDF format and provide a spreadsheet with the results:

java -jar tools-java-2.0.6-jar-with-dependencies.jar CompareDocs output.xlsx doc1 doc2 ... docN
java -jar tools-java-2.0.7-jar-with-dependencies.jar CompareDocs output.xlsx doc1 doc2 ... docN

* CompareMultipleSpdxDocs with directory

Example to compare all SPDX documents in a directory "/home/me/spdxdocs" and provide a spreadsheet with the results:

java -jar tools-java-2.0.6-jar-with-dependencies.jar CompareDocs output.xlsx /home/me/spdxdocs
java -jar tools-java-2.0.7-jar-with-dependencies.jar CompareDocs output.xlsx /home/me/spdxdocs

## SPDX Viewer

Expand All @@ -91,7 +91,7 @@ The following tool can be used to "Pretty Print" an SPDX document.

Sample usage:

java -jar tools-java-2.0.6-jar-with-dependencies.jar SPDXViewer ../testResources/SPDXRdfExample-v2.2.spdx.rdf
java -jar tools-java-2.0.7-jar-with-dependencies.jar SPDXViewer ../testResources/SPDXRdfExample-v2.2.spdx.rdf

## Verifier

Expand All @@ -101,7 +101,7 @@ The following tool can be used to verify an SPDX document:

Sample usage:

java -jar tools-java-2.0.6-jar-with-dependencies.jar Verify ../testResources/SPDXRdfExample-v2.2.spdx.rdf
java -jar tools-java-2.0.7-jar-with-dependencies.jar Verify ../testResources/SPDXRdfExample-v2.2.spdx.rdf

## Generators

Expand All @@ -111,7 +111,7 @@ The following tool can be used to generate an SPDX verification code from a dire

Sample usage:

java -jar tools-java-2.0.6-jar-with-dependencies.jar GenerateVerificationCode sourceDirectory [ignoredFilesRegex]
java -jar tools-java-2.0.7-jar-with-dependencies.jar GenerateVerificationCode sourceDirectory [ignoredFilesRegex]

## SPDX Validation Tool

Expand Down
1 change: 1 addition & 0 deletions RELEASE-CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
- [ ] Check for any warnings from the compiler and findbugs
- [ ] Run unit tests for all packages that depend on the application
- [ ] Run dependency check to find any potential vulnerabilities `mvn dependency-check:check`
- [ ] Update the README.md file with the new version of the jar file
- [ ] Run `mvn release:prepare` - you will be prompted for the release - typically take the defaults
- [ ] Run `mvn release:perform`
- [ ] Release artifacts to Maven Central
Expand Down
14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,32 +118,32 @@
<dependency>
<groupId>org.spdx</groupId>
<artifactId>java-spdx-library</artifactId>
<version>2.0.3</version>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-jackson-store</artifactId>
<version>2.0.5</version>
<version>2.0.6</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-rdf-store</artifactId>
<version>2.0.3</version>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-spreadsheet-store</artifactId>
<version>2.0.3</version>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-tagvalue-store</artifactId>
<version>2.0.3</version>
<version>2.0.4</version>
</dependency>
<dependency>
<groupId>org.spdx</groupId>
<artifactId>spdx-v3jsonld-store</artifactId>
<version>1.0.4</version>
<version>1.0.5</version>
</dependency>
<dependency>
<groupId>com.networknt</groupId>
Expand Down Expand Up @@ -314,7 +314,7 @@
<plugin>
<groupId>org.spdx</groupId>
<artifactId>spdx-maven-plugin</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<executions>
<execution>
<id>build-spdx</id>
Expand Down
Loading