replace all v2_1, v2_2 with new convention

Signed-off-by: Brandon Lum <lumjjb@gmail.com>

8 files changed, 13 insertions, 11 deletions

diff --git a/examples/10-jsonloader/example_json_loader.go b/examples/10-jsonloader/example_json_loader.go
index 793f10e..1ccf4d0 100644
--- a/examples/10-jsonloader/example_json_loader.go
+++ b/examples/10-jsonloader/example_json_loader.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/spdx/tools-golang/json"
+	spdx_json "github.com/spdx/tools-golang/json"
 )
 
 func main() {
diff --git a/examples/11-yamltotv/exampleyamltotv.go b/examples/11-yamltotv/exampleyamltotv.go
index b56a67d..d14201c 100644
--- a/examples/11-yamltotv/exampleyamltotv.go
+++ b/examples/11-yamltotv/exampleyamltotv.go
@@ -10,9 +10,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/spdx/tools-golang/tvsaver"
-	"github.com/spdx/tools-golang/yaml"
 	"os"
+
+	"github.com/spdx/tools-golang/tvsaver"
+	spdx_yaml "github.com/spdx/tools-golang/yaml"
 )
 
 func main() {
diff --git a/examples/12-tvtoyaml/exampletvtoyaml.go b/examples/12-tvtoyaml/exampletvtoyaml.go
index 1f43a03..19abde7 100644
--- a/examples/12-tvtoyaml/exampletvtoyaml.go
+++ b/examples/12-tvtoyaml/exampletvtoyaml.go
@@ -12,7 +12,7 @@ import (
 	"os"
 
 	"github.com/spdx/tools-golang/tvloader"
-	"github.com/spdx/tools-golang/yaml"
+	spdx_yaml "github.com/spdx/tools-golang/yaml"
 )
 
 func main() {
diff --git a/examples/13-yamlloader/exampleYAMLLoader.go b/examples/13-yamlloader/exampleYAMLLoader.go
index 237cc65..a032ece 100644
--- a/examples/13-yamlloader/exampleYAMLLoader.go
+++ b/examples/13-yamlloader/exampleYAMLLoader.go
@@ -12,7 +12,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/spdx/tools-golang/yaml"
+	spdx_yaml "github.com/spdx/tools-golang/yaml"
 )
 
 func main() {
diff --git a/examples/6-licensediff/example_licensediff.go b/examples/6-licensediff/example_licensediff.go
index 49d7603..39c369d 100644
--- a/examples/6-licensediff/example_licensediff.go
+++ b/examples/6-licensediff/example_licensediff.go
@@ -13,10 +13,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/spdx/tools-golang/spdx"
 	"os"
 
 	"github.com/spdx/tools-golang/licensediff"
+	"github.com/spdx/tools-golang/spdx/v2_2"
 	"github.com/spdx/tools-golang/spdxlib"
 	"github.com/spdx/tools-golang/tvloader"
 )
@@ -87,7 +87,7 @@ func main() {
 	for _, pkgID := range pkgIDsFirst {
 		fmt.Printf("================================\n")
 
-		var p1, p2 *spdx.Package2_2
+		var p1, p2 *v2_2.Package
 		var okFirst, okSecond bool
 		for _, pkg := range docFirst.Packages {
 			if pkg.PackageSPDXIdentifier == pkgID {
@@ -139,7 +139,7 @@ func main() {
 	// now report if there are any package IDs in the second set that aren't
 	// in the first
 	for _, pkgID := range pkgIDsSecond {
-		var p2 *spdx.Package2_2
+		var p2 *v2_2.Package
 		var okFirst, okSecond bool
 		for _, pkg := range docSecond.Packages {
 			if pkg.PackageSPDXIdentifier == pkgID {
diff --git a/examples/7-rdfloader/exampleRDFLoader.go b/examples/7-rdfloader/exampleRDFLoader.go
index 5258ac2..81206a4 100644
--- a/examples/7-rdfloader/exampleRDFLoader.go
+++ b/examples/7-rdfloader/exampleRDFLoader.go
@@ -4,9 +4,10 @@ package main
 
 import (
 	"fmt"
-	"github.com/spdx/tools-golang/rdfloader"
 	"os"
 	"strings"
+
+	"github.com/spdx/tools-golang/rdfloader"
 )
 
 func getFilePathFromUser() (string, error) {
diff --git a/examples/8-jsontotv/examplejsontotv.go b/examples/8-jsontotv/examplejsontotv.go
index 85be282..ee10bd2 100644
--- a/examples/8-jsontotv/examplejsontotv.go
+++ b/examples/8-jsontotv/examplejsontotv.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/json"
+	spdx_json "github.com/spdx/tools-golang/json"
 	"github.com/spdx/tools-golang/tvsaver"
 )
 
diff --git a/examples/9-tvtojson/exampletvtojson.go b/examples/9-tvtojson/exampletvtojson.go
index e8e6937..909677f 100644
--- a/examples/9-tvtojson/exampletvtojson.go
+++ b/examples/9-tvtojson/exampletvtojson.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/spdx/tools-golang/json"
+	spdx_json "github.com/spdx/tools-golang/json"
 	"github.com/spdx/tools-golang/tvloader"
 )