Implementation of SPDX version 3.0.0 spec#246

Merged

goneall merged 65 commits intomasterfrom

Sep 5, 2024

Member

goneall commented Jul 23, 2024

This is a HUGE pull request with a lot of breaking changes.

There are a number of additional dependent libraries which I plan to move to the SPDX github repo in the near future, so this is currently marked as a draft.

If you do want to attempt to compile and test, the additional repos are at github.com/goneall.

I'll update once the other repos are moved over.

goneall added 30 commits

July 10, 2023 16:39


          Change propertyName to propertyDescriptor

e4faf91

This is a breaking change.
Change the storage interface to use a PropertyDescriptor type which
includes both a property name and a namespace.  This prevents property
name collisions which will occur in the SPDX v3 model update.

To update any code which uses the storage interface, change the property
name to PropertyDescriptor for all calls to the interface which used
propertyName.

The constants have been updated to use the PropertyDescriptor type which
should minimize the amount of change.

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Rename existing model to compat.v2

a820f1b

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Change model factory to take into account SPDX versions

e51a073

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin - restructure storage interface

beac830

Still many unit tests are failing - but at least it compiles.
Change the storage interface to use object URI's - getting rid of
the requirement for SPDX document containers - causes a major
redesign

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin

20c1b17

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin

9e0d26d

All unit tests pass except compares

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin

2469ae3

Still some unit test failures in compare

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Completed support for compat V2

4f73df3

All unit tests now pass

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Add a check for the correct model store spdx version

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate commit - implement v3 model object core

e6c53b5

Unit tests are currently placeholders

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update verify to use profiles

3f8ec18

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Fix ModelCollectionTest for no GMO

38879ab

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          add a base builder class to ModelObject

d513983

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Fixes to pass unit tests

4b09e2d

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Add generated model code

a095390

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Remove Generic Model Object

fa8602e

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Move unit tests and update POM file for additional source directory

1d84bd7

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update generated files

f60f8fa

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Remove unused imports

971c361

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Udpate generated and resolve some unused imports

703bce3

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Add support for external maps and individuals

6183ae0

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update to newly generated files

23f13f3

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update generated files

c78b3da

Now compiles - unit test are currently failing

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin for major refactoring

1f9fe7a

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Working version for SPDXv2 annotation test

312dae1

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Working SPDX-3

7ac928a

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update unit test with unique V3 naming

d7a92cb

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin - unit test for CopyManager

d00efda

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Add convenience methods for SPDX 2.X and SPDX 3.X

bceae57

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Fix compare compile errors and unit tests for InMemSpdxStore

09a78d8

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>

goneall added 7 commits

June 25, 2024 15:07


          Updated to support API changes needed for the RDF store

f590ccd

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          API changes to support the tag/value store

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update for external references compatibility

f43397b

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Fix POM file errors and update the upgrade README

51212ee

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Make implentation version string public

71051d6

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Merge latest from master into v3-prototype branch

6595a27

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Additional merge from master

070676f

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>

goneall marked this pull request as draft

July 23, 2024 04:29

goneall added 14 commits

July 23, 2024 11:25


          Remove extra ListedLicenses added during merge

cbebf8d

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update API's to accept type hints for external

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Partial implementation of ModelSpecConverter

0a76886

Change ModelCopyManager to remove type parameter

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Redesigned spec conversion

c52f52f

Implementation is not complete - this is an intermediate checkin

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin - add conversion code

31f3a23

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Cleanup - remove unused resource files

be4b08a

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin - working on conversion, WIP

6e7093d

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Intermediate checkin - working convert package

099b822

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Change treatment of external licenses in license expression parser

6e585be

Required an update of the SPDX model 3 which renamed a few
fields.

There are 2 to the treatment of the external licenses:
- Uses a ID map rather than the SPDX document as a parameter
- Passes in the appropriate types

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Completed conversion SPDX V2 to SPDX V3

5fba1fc

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Fix issues with String to Agent

118cb55

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Fix: make sure creationInfo is added for listed licenses/exceptions

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update to SPDX 3.0.1

1587bc3

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Update POM for released files

e8d2c4b

Also fixes unit tests broken by the move of the compatible storage
manager

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>

goneall marked this pull request as ready for review

September 5, 2024 00:51

goneall added 2 commits

September 4, 2024 18:06


          Merge POM file changes

56196da

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>


          Disable missing javadocs errors

7dcec9b

After attempting to fix - fixed several, but many missing remain

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>

Member Author

goneall commented Sep 5, 2024

@pmonks - This is probably way to big of a pull request to review, but if you're available for a quick sanity check - I plan on merging and cutting an "Alpha" release of the library this week.

The upgrade documentation describes some of the changes.

Collaborator

pmonks commented Sep 5, 2024

@goneall I'm on vacation with limited cell / wifi until Sept 11th, but will be back then. Maybe go ahead with the alpha (which I can also test when I get back in my own code), and I'll prioritise a review as soon as I can?

Member Author

goneall commented Sep 5, 2024

@goneall I'm on vacation with limited cell / wifi until Sept 11th, but will be back then. Maybe go ahead with the alpha (which I can also test when I get back in my own code), and I'll prioritise a review as soon as I can?

@pmonks - I'll go ahead with the Alpha. I'll also sign up a couple other users of the library for a review after the alpha release. Enjoy your vacation!

goneall merged commit 0c34285 into master

goneall deleted the v3-prototype branch

September 5, 2024 15:21

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet