Skip to content

Commit 1587bc3

Browse files
goneallgoneall
committed
Update to SPDX 3.0.1
Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
1 parent 3648981 commit 1587bc3

28 files changed

Lines changed: 254 additions & 254 deletions

‎src/main/java/org/spdx/library/LicenseInfoFactory.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import org.spdx.library.model.v2.license.InvalidLicenseStringException;
3333
import org.spdx.library.model.v2.license.LicenseParserException;
3434
import org.spdx.library.model.v2.license.SpdxListedLicense;
35-
import org.spdx.library.model.v3_0_0.core.DictionaryEntry;
36-
import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicense;
37-
import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicenseException;
38-
import org.spdx.library.model.v3_0_0.simplelicensing.AnyLicenseInfo;
35+
import org.spdx.library.model.v3_0_1.core.DictionaryEntry;
36+
import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicense;
37+
import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicenseException;
38+
import org.spdx.library.model.v3_0_1.simplelicensing.AnyLicenseInfo;
3939
import org.spdx.storage.IModelStore;
4040
import org.spdx.utility.license.LicenseExpressionParser;
4141

‎src/main/java/org/spdx/library/ListedLicenses.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
3434
import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
3535
import org.spdx.library.model.v2.license.SpdxListedLicense;
36-
import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicense;
37-
import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicenseException;
36+
import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicense;
37+
import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicenseException;
3838
import org.spdx.storage.IModelStore;
3939
import org.spdx.storage.listedlicense.IListedLicenseStore;
4040
import org.spdx.storage.listedlicense.SpdxListedLicenseLocalStore;

‎src/main/java/org/spdx/library/ModelCopyManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.spdx.library.conversion.ISpdxConverter;
3636
import org.spdx.library.conversion.Spdx2to3Converter;
3737
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
38-
import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
38+
import org.spdx.library.model.v3_0_1.SpdxConstantsV3;
3939
import org.spdx.storage.IModelStore;
4040
import org.spdx.storage.IModelStore.IModelStoreLock;
4141
import org.spdx.storage.IModelStore.IdType;

‎src/main/java/org/spdx/library/SpdxModelFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.spdx.core.ModelRegistry;
3232
import org.spdx.core.ModelRegistryException;
3333
import org.spdx.library.model.v2.SpdxModelInfoV2_X;
34-
import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
34+
import org.spdx.library.model.v3_0_1.SpdxModelInfoV3_0;
3535
import org.spdx.storage.IModelStore;
3636

3737
/**

‎src/main/java/org/spdx/library/conversion/ExternalMapInfo.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import java.util.Optional;
2626

2727
import org.spdx.core.InvalidSPDXAnalysisException;
28-
import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
29-
import org.spdx.library.model.v3_0_0.SpdxModelClassFactoryV3;
30-
import org.spdx.library.model.v3_0_0.core.ExternalMap;
31-
import org.spdx.library.model.v3_0_0.core.Hash;
28+
import org.spdx.library.model.v3_0_1.SpdxConstantsV3;
29+
import org.spdx.library.model.v3_0_1.SpdxModelClassFactoryV3;
30+
import org.spdx.library.model.v3_0_1.core.ExternalMap;
31+
import org.spdx.library.model.v3_0_1.core.Hash;
3232
import org.spdx.storage.IModelStore;
3333
import org.spdx.storage.IModelStore.IdType;
3434

‎src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -36,55 +36,55 @@
3636
import org.spdx.library.ListedLicenses;
3737
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
3838
import org.spdx.library.model.v2.SpdxCreatorInformation;
39-
import org.spdx.library.model.v3_0_0.ModelObjectV3;
40-
import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
41-
import org.spdx.library.model.v3_0_0.SpdxModelClassFactoryV3;
42-
import org.spdx.library.model.v3_0_0.core.Agent;
43-
import org.spdx.library.model.v3_0_0.core.Annotation;
44-
import org.spdx.library.model.v3_0_0.core.AnnotationType;
45-
import org.spdx.library.model.v3_0_0.core.CreationInfo;
46-
import org.spdx.library.model.v3_0_0.core.Element;
47-
import org.spdx.library.model.v3_0_0.core.ExternalElement;
48-
import org.spdx.library.model.v3_0_0.core.ExternalIdentifierType;
49-
import org.spdx.library.model.v3_0_0.core.ExternalMap;
50-
import org.spdx.library.model.v3_0_0.core.ExternalRefType;
51-
import org.spdx.library.model.v3_0_0.core.Hash;
52-
import org.spdx.library.model.v3_0_0.core.HashAlgorithm;
53-
import org.spdx.library.model.v3_0_0.core.IntegrityMethod;
54-
import org.spdx.library.model.v3_0_0.core.LifecycleScopeType;
55-
import org.spdx.library.model.v3_0_0.core.LifecycleScopedRelationship;
56-
import org.spdx.library.model.v3_0_0.core.NamespaceMap;
57-
import org.spdx.library.model.v3_0_0.core.NoAssertionElement;
58-
import org.spdx.library.model.v3_0_0.core.NoneElement;
59-
import org.spdx.library.model.v3_0_0.core.Organization;
60-
import org.spdx.library.model.v3_0_0.core.PackageVerificationCode;
61-
import org.spdx.library.model.v3_0_0.core.Person;
62-
import org.spdx.library.model.v3_0_0.core.Relationship;
63-
import org.spdx.library.model.v3_0_0.core.RelationshipCompleteness;
64-
import org.spdx.library.model.v3_0_0.core.RelationshipType;
65-
import org.spdx.library.model.v3_0_0.core.SpdxDocument;
66-
import org.spdx.library.model.v3_0_0.core.Tool;
67-
import org.spdx.library.model.v3_0_0.expandedlicensing.ConjunctiveLicenseSet;
68-
import org.spdx.library.model.v3_0_0.expandedlicensing.CustomLicense;
69-
import org.spdx.library.model.v3_0_0.expandedlicensing.CustomLicenseAddition;
70-
import org.spdx.library.model.v3_0_0.expandedlicensing.DisjunctiveLicenseSet;
71-
import org.spdx.library.model.v3_0_0.expandedlicensing.ExtendableLicense;
72-
import org.spdx.library.model.v3_0_0.expandedlicensing.ExternalCustomLicense;
73-
import org.spdx.library.model.v3_0_0.expandedlicensing.License;
74-
import org.spdx.library.model.v3_0_0.expandedlicensing.LicenseAddition;
75-
import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicense;
76-
import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicenseException;
77-
import org.spdx.library.model.v3_0_0.expandedlicensing.NoAssertionLicense;
78-
import org.spdx.library.model.v3_0_0.expandedlicensing.NoneLicense;
79-
import org.spdx.library.model.v3_0_0.expandedlicensing.OrLaterOperator;
80-
import org.spdx.library.model.v3_0_0.expandedlicensing.WithAdditionOperator;
81-
import org.spdx.library.model.v3_0_0.simplelicensing.AnyLicenseInfo;
82-
import org.spdx.library.model.v3_0_0.software.ContentIdentifierType;
83-
import org.spdx.library.model.v3_0_0.software.Snippet;
84-
import org.spdx.library.model.v3_0_0.software.SoftwareArtifact;
85-
import org.spdx.library.model.v3_0_0.software.SoftwarePurpose;
86-
import org.spdx.library.model.v3_0_0.software.SpdxFile;
87-
import org.spdx.library.model.v3_0_0.software.SpdxPackage;
39+
import org.spdx.library.model.v3_0_1.ModelObjectV3;
40+
import org.spdx.library.model.v3_0_1.SpdxConstantsV3;
41+
import org.spdx.library.model.v3_0_1.SpdxModelClassFactoryV3;
42+
import org.spdx.library.model.v3_0_1.core.Agent;
43+
import org.spdx.library.model.v3_0_1.core.Annotation;
44+
import org.spdx.library.model.v3_0_1.core.AnnotationType;
45+
import org.spdx.library.model.v3_0_1.core.CreationInfo;
46+
import org.spdx.library.model.v3_0_1.core.Element;
47+
import org.spdx.library.model.v3_0_1.core.ExternalElement;
48+
import org.spdx.library.model.v3_0_1.core.ExternalIdentifierType;
49+
import org.spdx.library.model.v3_0_1.core.ExternalMap;
50+
import org.spdx.library.model.v3_0_1.core.ExternalRefType;
51+
import org.spdx.library.model.v3_0_1.core.Hash;
52+
import org.spdx.library.model.v3_0_1.core.HashAlgorithm;
53+
import org.spdx.library.model.v3_0_1.core.IntegrityMethod;
54+
import org.spdx.library.model.v3_0_1.core.LifecycleScopeType;
55+
import org.spdx.library.model.v3_0_1.core.LifecycleScopedRelationship;
56+
import org.spdx.library.model.v3_0_1.core.NamespaceMap;
57+
import org.spdx.library.model.v3_0_1.core.NoAssertionElement;
58+
import org.spdx.library.model.v3_0_1.core.NoneElement;
59+
import org.spdx.library.model.v3_0_1.core.Organization;
60+
import org.spdx.library.model.v3_0_1.core.PackageVerificationCode;
61+
import org.spdx.library.model.v3_0_1.core.Person;
62+
import org.spdx.library.model.v3_0_1.core.Relationship;
63+
import org.spdx.library.model.v3_0_1.core.RelationshipCompleteness;
64+
import org.spdx.library.model.v3_0_1.core.RelationshipType;
65+
import org.spdx.library.model.v3_0_1.core.SpdxDocument;
66+
import org.spdx.library.model.v3_0_1.core.Tool;
67+
import org.spdx.library.model.v3_0_1.expandedlicensing.ConjunctiveLicenseSet;
68+
import org.spdx.library.model.v3_0_1.expandedlicensing.CustomLicense;
69+
import org.spdx.library.model.v3_0_1.expandedlicensing.CustomLicenseAddition;
70+
import org.spdx.library.model.v3_0_1.expandedlicensing.DisjunctiveLicenseSet;
71+
import org.spdx.library.model.v3_0_1.expandedlicensing.ExtendableLicense;
72+
import org.spdx.library.model.v3_0_1.expandedlicensing.ExternalCustomLicense;
73+
import org.spdx.library.model.v3_0_1.expandedlicensing.License;
74+
import org.spdx.library.model.v3_0_1.expandedlicensing.LicenseAddition;
75+
import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicense;
76+
import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicenseException;
77+
import org.spdx.library.model.v3_0_1.expandedlicensing.NoAssertionLicense;
78+
import org.spdx.library.model.v3_0_1.expandedlicensing.NoneLicense;
79+
import org.spdx.library.model.v3_0_1.expandedlicensing.OrLaterOperator;
80+
import org.spdx.library.model.v3_0_1.expandedlicensing.WithAdditionOperator;
81+
import org.spdx.library.model.v3_0_1.simplelicensing.AnyLicenseInfo;
82+
import org.spdx.library.model.v3_0_1.software.ContentIdentifierType;
83+
import org.spdx.library.model.v3_0_1.software.Snippet;
84+
import org.spdx.library.model.v3_0_1.software.SoftwareArtifact;
85+
import org.spdx.library.model.v3_0_1.software.SoftwarePurpose;
86+
import org.spdx.library.model.v3_0_1.software.SpdxFile;
87+
import org.spdx.library.model.v3_0_1.software.SpdxPackage;
8888
import org.spdx.storage.IModelStore;
8989
import org.spdx.storage.IModelStore.IdType;
9090
import org.spdx.storage.listedlicense.SpdxListedLicenseModelStore;
@@ -172,9 +172,9 @@ public class Spdx2to3Converter implements ISpdxConverter {
172172
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.STATIC_LINK, RelationshipType.HAS_STATIC_LINK);
173173
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.TEST_CASE_OF, RelationshipType.HAS_TEST_CASE);
174174
swapToFromRelTypes.add(org.spdx.library.model.v2.enumerations.RelationshipType.TEST_CASE_OF);
175-
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.PREREQUISITE_FOR, RelationshipType.HAS_PREREQUSITE);
175+
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.PREREQUISITE_FOR, RelationshipType.HAS_PREREQUISITE);
176176
swapToFromRelTypes.add(org.spdx.library.model.v2.enumerations.RelationshipType.PREREQUISITE_FOR);
177-
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.HAS_PREREQUISITE, RelationshipType.HAS_PREREQUSITE);
177+
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.HAS_PREREQUISITE, RelationshipType.HAS_PREREQUISITE);
178178
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.VARIANT_OF, RelationshipType.HAS_VARIANT);
179179
swapToFromRelTypes.add(org.spdx.library.model.v2.enumerations.RelationshipType.VARIANT_OF);
180180
relationshipTypeMap.put(org.spdx.library.model.v2.enumerations.RelationshipType.BUILD_DEPENDENCY_OF, RelationshipType.DEPENDS_ON);
@@ -582,7 +582,7 @@ public SpdxDocument convertAndStore(org.spdx.library.model.v2.SpdxDocument fromD
582582
toObjectUri, SpdxConstantsV3.CORE_SPDX_DOCUMENT, copyManager, true, defaultUriPrefix);
583583
// NOTE: We have to add the external doc refs first so that the ExternalMap will be properly populated
584584
for (org.spdx.library.model.v2.ExternalDocumentRef externalDocRef:fromDoc.getExternalDocumentRefs()) {
585-
toDoc.getNamespaceMaps().add(convertAndStore(externalDocRef, toDoc.getImportss()));
585+
toDoc.getNamespaceMaps().add(convertAndStore(externalDocRef, toDoc.getSpdxImports()));
586586
}
587587
convertElementProperties(fromDoc, toDoc);
588588
toDoc.setCreationInfo(convertCreationInfo(fromDoc.getCreationInfo(), this.toModelStore, this.defaultUriPrefix));
@@ -1055,15 +1055,15 @@ public Hash convertAndStore(org.spdx.library.model.v2.Checksum checksum) throws
10551055
private void convertAndAddFileType(org.spdx.library.model.v2.enumerations.FileType fileType, SpdxFile file) throws InvalidSPDXAnalysisException {
10561056
switch (fileType) {
10571057
case ARCHIVE: addSoftwarePurpose(SoftwarePurpose.ARCHIVE, file); break;
1058-
case BINARY: file.setSoftwareContentType("application/octet-stream"); break;
1058+
case BINARY: file.setContentType("application/octet-stream"); break;
10591059
case SOURCE: addSoftwarePurpose(SoftwarePurpose.SOURCE, file); break;
1060-
case TEXT: file.setSoftwareContentType("text/plain"); break;
1060+
case TEXT: file.setContentType("text/plain"); break;
10611061
case APPLICATION: addSoftwarePurpose(SoftwarePurpose.APPLICATION, file); break;
1062-
case AUDIO: file.setSoftwareContentType("audio/*"); break;
1063-
case IMAGE: file.setSoftwareContentType("image/*"); break;
1064-
case VIDEO: file.setSoftwareContentType("video/*"); break;
1062+
case AUDIO: file.setContentType("audio/*"); break;
1063+
case IMAGE: file.setContentType("image/*"); break;
1064+
case VIDEO: file.setContentType("video/*"); break;
10651065
case DOCUMENTATION: addSoftwarePurpose(SoftwarePurpose.DOCUMENTATION, file); break;
1066-
case SPDX: file.setSoftwareContentType("text/spdx"); break;
1066+
case SPDX: file.setContentType("text/spdx"); break;
10671067
case OTHER: addSoftwarePurpose(SoftwarePurpose.OTHER, file); break;
10681068

10691069
default: throw new InvalidSPDXAnalysisException("Unknown file type "+fileType);

‎src/main/java/org/spdx/storage/listedlicense/ExceptionJson.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import org.spdx.core.InvalidSPDXAnalysisException;
3131
import org.spdx.core.InvalidSpdxPropertyException;
3232
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
33-
import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
34-
import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicenseException;
33+
import org.spdx.library.model.v3_0_1.SpdxConstantsV3;
34+
import org.spdx.library.model.v3_0_1.expandedlicensing.ListedLicenseException;
3535
import org.spdx.storage.PropertyDescriptor;
3636

3737

@@ -374,15 +374,15 @@ public boolean isCollectionMembersAssignableTo(PropertyDescriptor propertyDescri
374374
SpdxConstantsV3.PROP_SEE_ALSO.equals(propertyDescriptor)) {
375375
return String.class.isAssignableFrom(clazz);
376376
} else if (SpdxConstantsV3.PROP_EXTERNAL_REF.equals(propertyDescriptor)) {
377-
return org.spdx.library.model.v3_0_0.core.ExternalRef.class.isAssignableFrom(clazz);
377+
return org.spdx.library.model.v3_0_1.core.ExternalRef.class.isAssignableFrom(clazz);
378378
} else if (SpdxConstantsV3.PROP_VERIFIED_USING.equals(propertyDescriptor)) {
379-
return org.spdx.library.model.v3_0_0.core.IntegrityMethod.class.isAssignableFrom(clazz);
379+
return org.spdx.library.model.v3_0_1.core.IntegrityMethod.class.isAssignableFrom(clazz);
380380
} else if (SpdxConstantsV3.PROP_EXTENSION.equals(propertyDescriptor)) {
381-
return org.spdx.library.model.v3_0_0.extension.Extension.class.isAssignableFrom(clazz);
381+
return org.spdx.library.model.v3_0_1.extension.Extension.class.isAssignableFrom(clazz);
382382
} else if (SpdxConstantsV3.PROP_EXTERNAL_IDENTIFIER.equals(propertyDescriptor)) {
383-
return org.spdx.library.model.v3_0_0.core.ExternalIdentifier.class.isAssignableFrom(clazz);
383+
return org.spdx.library.model.v3_0_1.core.ExternalIdentifier.class.isAssignableFrom(clazz);
384384
} else if (SpdxConstantsV3.PROP_CREATED_USING.equals(propertyDescriptor)) {
385-
return org.spdx.library.model.v3_0_0.core.Tool.class.isAssignableFrom(clazz);
385+
return org.spdx.library.model.v3_0_1.core.Tool.class.isAssignableFrom(clazz);
386386
} else {
387387
return false;
388388
}

‎src/main/java/org/spdx/storage/listedlicense/LicenseCreationInfo.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.spdx.core.SpdxInvalidTypeException;
3333
import org.spdx.core.TypedValue;
3434
import org.spdx.library.model.v2.SpdxConstantsCompatV2;
35-
import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
36-
import org.spdx.library.model.v3_0_0.core.Agent;
35+
import org.spdx.library.model.v3_0_1.SpdxConstantsV3;
36+
import org.spdx.library.model.v3_0_1.core.Agent;
3737
import org.spdx.storage.PropertyDescriptor;
3838

3939
/**
@@ -127,15 +127,15 @@ public Object getValue(PropertyDescriptor propertyDescriptor) {
127127
public boolean isCollectionMembersAssignableTo(
128128
PropertyDescriptor propertyDescriptor, Class<?> clazz) {
129129
if (SpdxConstantsV3.PROP_EXTERNAL_REF.equals(propertyDescriptor)) {
130-
return org.spdx.library.model.v3_0_0.core.ExternalRef.class.isAssignableFrom(clazz);
130+
return org.spdx.library.model.v3_0_1.core.ExternalRef.class.isAssignableFrom(clazz);
131131
} else if (SpdxConstantsV3.PROP_VERIFIED_USING.equals(propertyDescriptor)) {
132-
return org.spdx.library.model.v3_0_0.core.IntegrityMethod.class.isAssignableFrom(clazz);
132+
return org.spdx.library.model.v3_0_1.core.IntegrityMethod.class.isAssignableFrom(clazz);
133133
} else if (SpdxConstantsV3.PROP_EXTENSION.equals(propertyDescriptor)) {
134-
return org.spdx.library.model.v3_0_0.extension.Extension.class.isAssignableFrom(clazz);
134+
return org.spdx.library.model.v3_0_1.extension.Extension.class.isAssignableFrom(clazz);
135135
} else if (SpdxConstantsV3.PROP_EXTERNAL_IDENTIFIER.equals(propertyDescriptor)) {
136-
return org.spdx.library.model.v3_0_0.core.ExternalIdentifier.class.isAssignableFrom(clazz);
136+
return org.spdx.library.model.v3_0_1.core.ExternalIdentifier.class.isAssignableFrom(clazz);
137137
} else if (SpdxConstantsV3.PROP_CREATED_USING.equals(propertyDescriptor)) {
138-
return org.spdx.library.model.v3_0_0.core.Tool.class.isAssignableFrom(clazz);
138+
return org.spdx.library.model.v3_0_1.core.Tool.class.isAssignableFrom(clazz);
139139
} else if (SpdxConstantsV3.PROP_CREATED_BY.equals(propertyDescriptor)) {
140140
return (Agent.class.equals(clazz) || LicenseCreatorAgent.class.equals(clazz));
141141
} else {

‎src/main/java/org/spdx/storage/listedlicense/LicenseCreatorAgent.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
import org.spdx.core.SpdxInvalidIdException;
2828
import org.spdx.core.SpdxInvalidTypeException;
2929
import org.spdx.core.TypedValue;
30-
import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
31-
import org.spdx.library.model.v3_0_0.core.Agent;
32-
import org.spdx.library.model.v3_0_0.core.CreationInfo;
30+
import org.spdx.library.model.v3_0_1.SpdxConstantsV3;
31+
import org.spdx.library.model.v3_0_1.core.Agent;
32+
import org.spdx.library.model.v3_0_1.core.CreationInfo;
3333
import org.spdx.storage.PropertyDescriptor;
3434

3535
/**
@@ -100,15 +100,15 @@ public Object getValue(PropertyDescriptor propertyDescriptor) throws InvalidSPDX
100100
public boolean isCollectionMembersAssignableTo(
101101
PropertyDescriptor propertyDescriptor, Class<?> clazz) {
102102
if (SpdxConstantsV3.PROP_EXTERNAL_REF.equals(propertyDescriptor)) {
103-
return org.spdx.library.model.v3_0_0.core.ExternalRef.class.isAssignableFrom(clazz);
103+
return org.spdx.library.model.v3_0_1.core.ExternalRef.class.isAssignableFrom(clazz);
104104
} else if (SpdxConstantsV3.PROP_VERIFIED_USING.equals(propertyDescriptor)) {
105-
return org.spdx.library.model.v3_0_0.core.IntegrityMethod.class.isAssignableFrom(clazz);
105+
return org.spdx.library.model.v3_0_1.core.IntegrityMethod.class.isAssignableFrom(clazz);
106106
} else if (SpdxConstantsV3.PROP_EXTENSION.equals(propertyDescriptor)) {
107-
return org.spdx.library.model.v3_0_0.extension.Extension.class.isAssignableFrom(clazz);
107+
return org.spdx.library.model.v3_0_1.extension.Extension.class.isAssignableFrom(clazz);
108108
} else if (SpdxConstantsV3.PROP_EXTERNAL_IDENTIFIER.equals(propertyDescriptor)) {
109-
return org.spdx.library.model.v3_0_0.core.ExternalIdentifier.class.isAssignableFrom(clazz);
109+
return org.spdx.library.model.v3_0_1.core.ExternalIdentifier.class.isAssignableFrom(clazz);
110110
} else if (SpdxConstantsV3.PROP_CREATED_USING.equals(propertyDescriptor)) {
111-
return org.spdx.library.model.v3_0_0.core.Tool.class.isAssignableFrom(clazz);
111+
return org.spdx.library.model.v3_0_1.core.Tool.class.isAssignableFrom(clazz);
112112
} else if (SpdxConstantsV3.PROP_CREATED_BY.equals(propertyDescriptor)) {
113113
return (Agent.class.equals(clazz) || LicenseCreatorAgent.class.equals(clazz));
114114
} else {

0 commit comments

Comments
 (0)