Renamed model version 3

goneall · goneall · commit 528339ce1c29 · 2024-08-17T15:01:07.000-07:00
Signed-off-by: Gary O'Neall &lt;gary@sourceauditor.com&gt;
diff --git a/src/main/java/org/spdx/spdxRdfStore/RdfSpdxModelManager.java b/src/main/java/org/spdx/spdxRdfStore/RdfSpdxModelManager.java
@@ -75,7 +75,7 @@
 import org.spdx.library.ListedLicenses;
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
-import org.spdx.library.model.v3.SpdxEnumFactory;
+import org.spdx.library.model.v3_0_0.SpdxEnumFactory;
 import org.spdx.library.referencetype.ListedReferenceTypes;
 import org.spdx.storage.IModelStore.IdType;
 import org.spdx.storage.PropertyDescriptor;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/AnnotationTest.java b/src/test/java/org/spdx/library/model/compat/v2/AnnotationTest.java
@@ -31,7 +31,7 @@
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.enumerations.AnnotationType;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/ByteOffsetPointerTest.java b/src/test/java/org/spdx/library/model/compat/v2/ByteOffsetPointerTest.java
@@ -29,7 +29,7 @@
 import org.spdx.library.model.v2.SpdxElement;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.pointer.ByteOffsetPointer;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/ChecksumTest.java b/src/test/java/org/spdx/library/model/compat/v2/ChecksumTest.java
@@ -30,7 +30,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.Version;
 import org.spdx.library.model.v2.enumerations.ChecksumAlgorithm;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/ExternalDocumentRefTest.java b/src/test/java/org/spdx/library/model/compat/v2/ExternalDocumentRefTest.java
@@ -34,7 +34,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.Version;
 import org.spdx.library.model.v2.enumerations.ChecksumAlgorithm;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/ExternalRefTest.java b/src/test/java/org/spdx/library/model/compat/v2/ExternalRefTest.java
@@ -31,7 +31,7 @@
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.enumerations.ReferenceCategory;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.library.referencetype.ListedReferenceTypes;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/ExternalSpdxElementTest.java b/src/test/java/org/spdx/library/model/compat/v2/ExternalSpdxElementTest.java
@@ -18,7 +18,7 @@
 import org.spdx.library.model.v2.Version;
 import org.spdx.library.model.v2.enumerations.ChecksumAlgorithm;
 import org.spdx.library.model.v2.enumerations.RelationshipType;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore.IdType;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/IndividualUriValueTest.java b/src/test/java/org/spdx/library/model/compat/v2/IndividualUriValueTest.java
@@ -17,7 +17,7 @@
 import org.spdx.library.model.v2.license.ExternalExtractedLicenseInfo;
 import org.spdx.library.model.v2.license.SpdxNoAssertionLicense;
 import org.spdx.library.model.v2.license.SpdxNoneLicense;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/LineCharPointerTest.java b/src/test/java/org/spdx/library/model/compat/v2/LineCharPointerTest.java
@@ -30,7 +30,7 @@
 import org.spdx.library.model.v2.SpdxElement;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.pointer.LineCharPointer;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/ModelCollectionTest.java b/src/test/java/org/spdx/library/model/compat/v2/ModelCollectionTest.java
@@ -13,7 +13,7 @@
 import org.spdx.library.model.v2.GenericSpdxElement;
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.PropertyDescriptor;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/NoAssertionElementTest.java b/src/test/java/org/spdx/library/model/compat/v2/NoAssertionElementTest.java
@@ -26,7 +26,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.SpdxNoAssertionElement;
 import org.spdx.library.model.v2.enumerations.RelationshipType;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/RelatedElementCollectionTest.java b/src/test/java/org/spdx/library/model/compat/v2/RelatedElementCollectionTest.java
@@ -34,7 +34,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.Version;
 import org.spdx.library.model.v2.enumerations.RelationshipType;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/RelationshipTest.java b/src/test/java/org/spdx/library/model/compat/v2/RelationshipTest.java
@@ -52,7 +52,7 @@
 import org.spdx.library.model.v2.license.ExtractedLicenseInfo;
 import org.spdx.library.model.v2.license.SpdxListedLicense;
 import org.spdx.library.model.v2.license.SpdxNoAssertionLicense;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.IModelStore.IdType;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxConstantElementTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxConstantElementTest.java
@@ -30,7 +30,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.SpdxNoAssertionElement;
 import org.spdx.library.model.v2.SpdxNoneElement;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxCreatorInformationTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxCreatorInformationTest.java
@@ -17,7 +17,7 @@
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxCreatorInformation;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxDocumentTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxDocumentTest.java
@@ -51,7 +51,7 @@
 import org.spdx.library.model.v2.license.ExtractedLicenseInfo;
 import org.spdx.library.model.v2.license.SimpleLicensingInfo;
 import org.spdx.library.model.v2.license.SpdxListedLicense;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.CompatibleModelStoreWrapper;
 import org.spdx.storage.IModelStore;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxElementTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxElementTest.java
@@ -36,7 +36,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.enumerations.AnnotationType;
 import org.spdx.library.model.v2.enumerations.RelationshipType;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore.IdType;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxFileTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxFileTest.java
@@ -29,7 +29,7 @@
 import org.spdx.library.model.v2.license.DisjunctiveLicenseSet;
 import org.spdx.library.model.v2.license.ExtractedLicenseInfo;
 import org.spdx.library.model.v2.license.SpdxListedLicense;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore.IdType;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxModelFactoryTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxModelFactoryTest.java
@@ -15,7 +15,7 @@
 import org.spdx.library.model.v2.SpdxDocument;
 import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxNoneElementTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxNoneElementTest.java
@@ -27,7 +27,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.SpdxNoneElement;
 import org.spdx.library.model.v2.enumerations.RelationshipType;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxPackageTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxPackageTest.java
@@ -52,7 +52,7 @@
 import org.spdx.library.model.v2.enumerations.RelationshipType;
 import org.spdx.library.model.v2.license.AnyLicenseInfo;
 import org.spdx.library.model.v2.license.ExtractedLicenseInfo;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore.IdType;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxPackageVerificationCodeTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxPackageVerificationCodeTest.java
@@ -28,7 +28,7 @@
 import org.spdx.library.ModelCopyManager;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.SpdxPackageVerificationCode;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.IModelStore.IdType;
diff --git a/src/test/java/org/spdx/library/model/compat/v2/SpdxSnippetTest.java b/src/test/java/org/spdx/library/model/compat/v2/SpdxSnippetTest.java
@@ -45,7 +45,7 @@
 import org.spdx.library.model.v2.pointer.ByteOffsetPointer;
 import org.spdx.library.model.v2.pointer.LineCharPointer;
 import org.spdx.library.model.v2.pointer.StartEndPointer;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 import org.spdx.storage.IModelStore.IdType;
 
diff --git a/src/test/java/org/spdx/library/model/compat/v2/StartEndPointerTest.java b/src/test/java/org/spdx/library/model/compat/v2/StartEndPointerTest.java
@@ -32,7 +32,7 @@
 import org.spdx.library.model.v2.pointer.LineCharPointer;
 import org.spdx.library.model.v2.pointer.SinglePointer;
 import org.spdx.library.model.v2.pointer.StartEndPointer;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/spdx/spdxRdfStore/RdfSpdxDocumentModelManagerTest.java b/src/test/java/org/spdx/spdxRdfStore/RdfSpdxDocumentModelManagerTest.java
@@ -20,7 +20,7 @@
 import org.spdx.core.TypedValue;
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.storage.CompatibleModelStoreWrapper;
 import org.spdx.storage.IModelStore.IdType;
 
diff --git a/src/test/java/org/spdx/spdxRdfStore/RdfStoreTest.java b/src/test/java/org/spdx/spdxRdfStore/RdfStoreTest.java
@@ -30,7 +30,7 @@
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v2.SpdxPackage;
 import org.spdx.library.model.v2.enumerations.RelationshipType;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.storage.CompatibleModelStoreWrapper;
 
 import junit.framework.TestCase;
