Move CompatibleModelStoreWrapper to V2 model

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

Author: goneall

pom.xml

@@ -118,7 +118,7 @@
     <dependency>
     	<groupId>org.spdx</groupId>
     	<artifactId>java-spdx-library</artifactId>
-    	<version>2.0.0-SNAPSHOT</version>
+    	<version>2.0.0-Alpha</version>
     </dependency>
     <dependency>
     	<groupId>org.apache.jena</groupId>

src/main/java/org/spdx/spdxRdfStore/RdfSpdxModelManager.java

@@ -78,7 +78,7 @@
 import org.spdx.library.model.v3_0_1.SpdxEnumFactory;
 import org.spdx.library.referencetype.ListedReferenceTypes;
 import org.spdx.storage.IModelStore.IdType;
-import org.spdx.storage.CompatibleModelStoreWrapper;
+import org.spdx.storage.compatv2.CompatibleModelStoreWrapper;
 import org.spdx.storage.IModelStore.IModelStoreLock;
 
 /**

src/main/java/org/spdx/spdxRdfStore/RdfStore.java

@@ -49,10 +49,10 @@
 import org.spdx.library.SpdxModelFactory;
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxDocument;
-import org.spdx.storage.CompatibleModelStoreWrapper;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.ISerializableModelStore;
 import org.spdx.storage.PropertyDescriptor;
+import org.spdx.storage.compatv2.CompatibleModelStoreWrapper;
 
 /**
  * Model Store implemented using RDF

src/test/java/org/spdx/library/model/compat/v2/SpdxDocumentTest.java

@@ -53,9 +53,9 @@
 import org.spdx.library.model.v2.license.SpdxListedLicense;
 import org.spdx.library.model.v3_0_1.SpdxModelInfoV3_0;
 import org.spdx.spdxRdfStore.RdfStore;
-import org.spdx.storage.CompatibleModelStoreWrapper;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.IModelStore.IdType;
+import org.spdx.storage.compatv2.CompatibleModelStoreWrapper;
 
 import junit.framework.TestCase;
 

src/test/java/org/spdx/spdxRdfStore/RdfSpdxDocumentModelManagerTest.java

@@ -21,8 +21,8 @@
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
 import org.spdx.library.model.v3_0_1.SpdxModelInfoV3_0;
-import org.spdx.storage.CompatibleModelStoreWrapper;
 import org.spdx.storage.IModelStore.IdType;
+import org.spdx.storage.compatv2.CompatibleModelStoreWrapper;
 
 import junit.framework.TestCase;
 

src/test/java/org/spdx/spdxRdfStore/RdfStoreTest.java

@@ -34,7 +34,7 @@
 import org.spdx.library.model.v2.SpdxPackage;
 import org.spdx.library.model.v2.enumerations.RelationshipType;
 import org.spdx.library.model.v3_0_1.SpdxModelInfoV3_0;
-import org.spdx.storage.CompatibleModelStoreWrapper;
+import org.spdx.storage.compatv2.CompatibleModelStoreWrapper;
 
 import junit.framework.TestCase;