From 975d06726e4e7e9bc67000a3bb370c87469d7cbd Mon Sep 17 00:00:00 2001
From: Kanika Rana <krana@redhat.com>
Date: Wed, 22 Jul 2020 17:24:24 -0400
Subject: [PATCH 1/4] updated imports to reflect the org change of repo

---
 go.mod                                           | 2 +-
 main.go                                          | 4 ++--
 pkg/devfile/parser/context/apiVersion.go         | 2 +-
 pkg/devfile/parser/context/content_test.go       | 2 +-
 pkg/devfile/parser/context/context.go            | 4 ++--
 pkg/devfile/parser/context/context_test.go       | 2 +-
 pkg/devfile/parser/context/fs.go                 | 2 +-
 pkg/devfile/parser/context/schema.go             | 2 +-
 pkg/devfile/parser/context/schema_test.go        | 2 +-
 pkg/devfile/parser/data/1.0.0/components.go      | 2 +-
 pkg/devfile/parser/data/2.0.0/components.go      | 2 +-
 pkg/devfile/parser/data/2.0.0/components_test.go | 2 +-
 pkg/devfile/parser/data/2.0.0/types.go           | 2 +-
 pkg/devfile/parser/data/2.1.0/components.go      | 2 +-
 pkg/devfile/parser/data/2.1.0/components_test.go | 2 +-
 pkg/devfile/parser/data/2.1.0/types.go           | 2 +-
 pkg/devfile/parser/data/helper_test.go           | 2 +-
 pkg/devfile/parser/data/interface.go             | 2 +-
 pkg/devfile/parser/data/versions.go              | 6 +++---
 pkg/devfile/parser/parse.go                      | 8 ++++----
 pkg/devfile/parser/types.go                      | 4 ++--
 pkg/devfile/parser/writer_test.go                | 6 +++---
 pkg/devfile/validate/components.go               | 2 +-
 pkg/devfile/validate/components_test.go          | 2 +-
 pkg/devfile/validate/validate.go                 | 8 ++++----
 pkg/testingutil/devfile.go                       | 4 ++--
 pkg/util/file_indexer.go                         | 2 +-
 pkg/util/file_indexer_test.go                    | 2 +-
 pkg/util/util.go                                 | 2 +-
 pkg/util/util_test.go                            | 2 +-
 30 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/go.mod b/go.mod
index 423fd7c3..c0014b77 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/cli-playground/devfile-parser
+module github.com/devfile/devfile-parser
 
 go 1.14
 
diff --git a/main.go b/main.go
index a1d0d4c0..a39df21f 100644
--- a/main.go
+++ b/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser"
-	devfileParser "github.com/cli-playground/devfile-parser/pkg/devfile/parser"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser"
+	devfileParser "github.com/devfile/devfile-parser/pkg/devfile/parser"
 )
 
 func main() {
diff --git a/pkg/devfile/parser/context/apiVersion.go b/pkg/devfile/parser/context/apiVersion.go
index 8973d0c8..ca4be7d3 100644
--- a/pkg/devfile/parser/context/apiVersion.go
+++ b/pkg/devfile/parser/context/apiVersion.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
 	"github.com/pkg/errors"
 	"k8s.io/klog"
 )
diff --git a/pkg/devfile/parser/context/content_test.go b/pkg/devfile/parser/context/content_test.go
index a40890ce..74c2c4b0 100644
--- a/pkg/devfile/parser/context/content_test.go
+++ b/pkg/devfile/parser/context/content_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
 )
 
 const (
diff --git a/pkg/devfile/parser/context/context.go b/pkg/devfile/parser/context/context.go
index 286a68dc..21e3e8b8 100644
--- a/pkg/devfile/parser/context/context.go
+++ b/pkg/devfile/parser/context/context.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"fmt"
 
-	"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
-	"github.com/cli-playground/devfile-parser/pkg/util"
+	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/devfile-parser/pkg/util"
 	"k8s.io/klog"
 )
 
diff --git a/pkg/devfile/parser/context/context_test.go b/pkg/devfile/parser/context/context_test.go
index 15ddc8b6..d53741e6 100644
--- a/pkg/devfile/parser/context/context_test.go
+++ b/pkg/devfile/parser/context/context_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
 )
 
 func TestPopulateFromBytes(t *testing.T) {
diff --git a/pkg/devfile/parser/context/fs.go b/pkg/devfile/parser/context/fs.go
index fd1fb7e8..75a3b3e8 100644
--- a/pkg/devfile/parser/context/fs.go
+++ b/pkg/devfile/parser/context/fs.go
@@ -1,6 +1,6 @@
 package parser
 
-import "github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
+import "github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
 
 // GetFs returns the filesystem object
 func (d *DevfileCtx) GetFs() filesystem.Filesystem {
diff --git a/pkg/devfile/parser/context/schema.go b/pkg/devfile/parser/context/schema.go
index 075d9af6..925190ef 100644
--- a/pkg/devfile/parser/context/schema.go
+++ b/pkg/devfile/parser/context/schema.go
@@ -3,7 +3,7 @@ package parser
 import (
 	"fmt"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
 	"github.com/pkg/errors"
 	"github.com/xeipuuv/gojsonschema"
 	"k8s.io/klog"
diff --git a/pkg/devfile/parser/context/schema_test.go b/pkg/devfile/parser/context/schema_test.go
index f1b21543..e5e03ae7 100644
--- a/pkg/devfile/parser/context/schema_test.go
+++ b/pkg/devfile/parser/context/schema_test.go
@@ -3,7 +3,7 @@ package parser
 import (
 	"testing"
 
-	v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
+	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
 )
 
 const (
diff --git a/pkg/devfile/parser/data/1.0.0/components.go b/pkg/devfile/parser/data/1.0.0/components.go
index 759f619e..ca533b51 100644
--- a/pkg/devfile/parser/data/1.0.0/components.go
+++ b/pkg/devfile/parser/data/1.0.0/components.go
@@ -3,7 +3,7 @@ package version100
 import (
 	"strings"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 func (d *Devfile100) GetMetadata() common.DevfileMetadata {
diff --git a/pkg/devfile/parser/data/2.0.0/components.go b/pkg/devfile/parser/data/2.0.0/components.go
index 5c159f28..94eaf32b 100644
--- a/pkg/devfile/parser/data/2.0.0/components.go
+++ b/pkg/devfile/parser/data/2.0.0/components.go
@@ -3,7 +3,7 @@ package version200
 import (
 	"strings"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 // GetComponents returns the slice of DevfileComponent objects parsed from the Devfile
diff --git a/pkg/devfile/parser/data/2.0.0/components_test.go b/pkg/devfile/parser/data/2.0.0/components_test.go
index b3d54614..c2565937 100644
--- a/pkg/devfile/parser/data/2.0.0/components_test.go
+++ b/pkg/devfile/parser/data/2.0.0/components_test.go
@@ -3,7 +3,7 @@ package version200
 import (
 	"testing"
 
-	common "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	common "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 func TestGetCommands(t *testing.T) {
diff --git a/pkg/devfile/parser/data/2.0.0/types.go b/pkg/devfile/parser/data/2.0.0/types.go
index 3cfbcd54..81e1b37d 100644
--- a/pkg/devfile/parser/data/2.0.0/types.go
+++ b/pkg/devfile/parser/data/2.0.0/types.go
@@ -1,6 +1,6 @@
 package version200
 
-import "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+import "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 
 // CommandGroupType describes the kind of command group.
 // +kubebuilder:validation:Enum=build;run;test;debug
diff --git a/pkg/devfile/parser/data/2.1.0/components.go b/pkg/devfile/parser/data/2.1.0/components.go
index 0a409d1b..6fab9b9a 100644
--- a/pkg/devfile/parser/data/2.1.0/components.go
+++ b/pkg/devfile/parser/data/2.1.0/components.go
@@ -3,7 +3,7 @@ package version210
 import (
 	"strings"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 // GetComponents returns the slice of DevfileComponent objects parsed from the Devfile
diff --git a/pkg/devfile/parser/data/2.1.0/components_test.go b/pkg/devfile/parser/data/2.1.0/components_test.go
index 1bc7b8d7..29d88136 100644
--- a/pkg/devfile/parser/data/2.1.0/components_test.go
+++ b/pkg/devfile/parser/data/2.1.0/components_test.go
@@ -3,7 +3,7 @@ package version210
 import (
 	"testing"
 
-	common "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	common "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 func TestGetCommands(t *testing.T) {
diff --git a/pkg/devfile/parser/data/2.1.0/types.go b/pkg/devfile/parser/data/2.1.0/types.go
index c2abb797..42dbaef5 100644
--- a/pkg/devfile/parser/data/2.1.0/types.go
+++ b/pkg/devfile/parser/data/2.1.0/types.go
@@ -1,6 +1,6 @@
 package version210
 
-import "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+import "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 
 // CommandGroupType describes the kind of command group.
 // +kubebuilder:validation:Enum=build;run;test;debug
diff --git a/pkg/devfile/parser/data/helper_test.go b/pkg/devfile/parser/data/helper_test.go
index ea67e5ce..ee18a3a8 100644
--- a/pkg/devfile/parser/data/helper_test.go
+++ b/pkg/devfile/parser/data/helper_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
+	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
 )
 
 func TestNewDevfileData(t *testing.T) {
diff --git a/pkg/devfile/parser/data/interface.go b/pkg/devfile/parser/data/interface.go
index 2f743ba8..aa2adbe0 100644
--- a/pkg/devfile/parser/data/interface.go
+++ b/pkg/devfile/parser/data/interface.go
@@ -1,7 +1,7 @@
 package data
 
 import (
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 // DevfileData is an interface that defines functions for Devfile data operations
diff --git a/pkg/devfile/parser/data/versions.go b/pkg/devfile/parser/data/versions.go
index ee20e6d8..918dd251 100644
--- a/pkg/devfile/parser/data/versions.go
+++ b/pkg/devfile/parser/data/versions.go
@@ -3,9 +3,9 @@ package data
 import (
 	"reflect"
 
-	v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
-	v200 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.0.0"
-	v210 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.1.0"
+	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
+	v200 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.0.0"
+	v210 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.1.0"
 )
 
 // SupportedApiVersions stores the supported devfile API versions
diff --git a/pkg/devfile/parser/parse.go b/pkg/devfile/parser/parse.go
index 84202137..33789a63 100644
--- a/pkg/devfile/parser/parse.go
+++ b/pkg/devfile/parser/parse.go
@@ -3,10 +3,10 @@ package parser
 import (
 	"encoding/json"
 
-	devfileCtx "github.com/cli-playground/devfile-parser/pkg/devfile/parser/context"
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
-	"github.com/cli-playground/devfile-parser/pkg/devfile/validate"
-	"github.com/cli-playground/devfile-parser/pkg/errors"
+	devfileCtx "github.com/devfile/devfile-parser/pkg/devfile/parser/context"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
+	"github.com/devfile/devfile-parser/pkg/devfile/validate"
+	"github.com/devfile/devfile-parser/pkg/errors"
 )
 
 // ParseDevfile func validates the devfile integrity.
diff --git a/pkg/devfile/parser/types.go b/pkg/devfile/parser/types.go
index 3cc6413c..1dfd5452 100644
--- a/pkg/devfile/parser/types.go
+++ b/pkg/devfile/parser/types.go
@@ -1,8 +1,8 @@
 package parser
 
 import (
-	devfileCtx "github.com/cli-playground/devfile-parser/pkg/devfile/parser/context"
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data"
+	devfileCtx "github.com/devfile/devfile-parser/pkg/devfile/parser/context"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
 )
 
 // Default filenames for create devfile
diff --git a/pkg/devfile/parser/writer_test.go b/pkg/devfile/parser/writer_test.go
index bc494ca3..a397a9d1 100644
--- a/pkg/devfile/parser/writer_test.go
+++ b/pkg/devfile/parser/writer_test.go
@@ -3,9 +3,9 @@ package parser
 import (
 	"testing"
 
-	devfileCtx "github.com/cli-playground/devfile-parser/pkg/devfile/parser/context"
-	v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
-	"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
+	devfileCtx "github.com/devfile/devfile-parser/pkg/devfile/parser/context"
+	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
+	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
 )
 
 func TestWriteJsonDevfile(t *testing.T) {
diff --git a/pkg/devfile/validate/components.go b/pkg/devfile/validate/components.go
index fb86a49c..6b883044 100644
--- a/pkg/devfile/validate/components.go
+++ b/pkg/devfile/validate/components.go
@@ -3,7 +3,7 @@ package validate
 import (
 	"fmt"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 // Errors
diff --git a/pkg/devfile/validate/components_test.go b/pkg/devfile/validate/components_test.go
index 7b0cf22f..a770a75f 100644
--- a/pkg/devfile/validate/components_test.go
+++ b/pkg/devfile/validate/components_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 func TestValidateComponents(t *testing.T) {
diff --git a/pkg/devfile/validate/validate.go b/pkg/devfile/validate/validate.go
index 3796d1fa..2ede7bad 100644
--- a/pkg/devfile/validate/validate.go
+++ b/pkg/devfile/validate/validate.go
@@ -3,12 +3,12 @@ package validate
 import (
 	"reflect"
 
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 	"k8s.io/klog"
 
-	v100 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/1.0.0"
-	v200 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.0.0"
-	v210 "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/2.1.0"
+	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
+	v200 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.0.0"
+	v210 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.1.0"
 )
 
 // ValidateDevfileData validates whether sections of devfile are odo compatible
diff --git a/pkg/testingutil/devfile.go b/pkg/testingutil/devfile.go
index d3eb244c..c8f5ec6d 100644
--- a/pkg/testingutil/devfile.go
+++ b/pkg/testingutil/devfile.go
@@ -1,8 +1,8 @@
 package testingutil
 
 import (
-	"github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
-	versionsCommon "github.com/cli-playground/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	versionsCommon "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
 )
 
 // TestDevfileData is a convenience data type used to mock up a devfile configuration
diff --git a/pkg/util/file_indexer.go b/pkg/util/file_indexer.go
index 7d2bf524..aff8dd8e 100644
--- a/pkg/util/file_indexer.go
+++ b/pkg/util/file_indexer.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog"
diff --git a/pkg/util/file_indexer_test.go b/pkg/util/file_indexer_test.go
index 4c955f71..80715e4b 100644
--- a/pkg/util/file_indexer_test.go
+++ b/pkg/util/file_indexer_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
 )
 
 func TestCheckGitIgnoreFile(t *testing.T) {
diff --git a/pkg/util/util.go b/pkg/util/util.go
index cd4a083a..dcb40561 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cli-playground/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
 	"github.com/gobwas/glob"
 	"github.com/google/go-github/github"
 	"github.com/pkg/errors"
diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go
index e59c0109..87c9af46 100644
--- a/pkg/util/util_test.go
+++ b/pkg/util/util_test.go
@@ -1969,7 +1969,7 @@ func TestDownloadInMemory(t *testing.T) {
 	}{
 		{
 			name: "Case 1: valid URL",
-			url:  "https://github.com/cli-playground/devfile-parser/blob/master/tests/examples/source/devfiles/nodejs/devfile.yaml",
+			url:  "https://github.com/devfile/devfile-parser/blob/master/tests/examples/source/devfiles/nodejs/devfile.yaml",
 			want: true,
 		},
 		{

From ab425fc8fb698ae69dd92eb742d91ebfdc69d212 Mon Sep 17 00:00:00 2001
From: ranakan19 <46766610+ranakan19@users.noreply.github.com>
Date: Thu, 23 Jul 2020 14:22:24 -0400
Subject: [PATCH 2/4] Update pkg/util/util_test.go

Co-authored-by: Serhii Leshchenko <sleshche@redhat.com>
---
 pkg/util/util_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go
index 87c9af46..89c04621 100644
--- a/pkg/util/util_test.go
+++ b/pkg/util/util_test.go
@@ -1969,7 +1969,7 @@ func TestDownloadInMemory(t *testing.T) {
 	}{
 		{
 			name: "Case 1: valid URL",
-			url:  "https://github.com/devfile/devfile-parser/blob/master/tests/examples/source/devfiles/nodejs/devfile.yaml",
+			url:  "https://github.com/devfile/devfile-parser/blob/master/devfile.yaml",
 			want: true,
 		},
 		{

From 47124e2e3be54441fe897818e5eac32af2cc589e Mon Sep 17 00:00:00 2001
From: Kanika Rana <krana@redhat.com>
Date: Thu, 23 Jul 2020 14:37:02 -0400
Subject: [PATCH 3/4] updated go.mod and go.sum after go mod tidy

---
 go.mod |  5 +----
 go.sum | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/go.mod b/go.mod
index c0014b77..fb1e2583 100644
--- a/go.mod
+++ b/go.mod
@@ -3,10 +3,6 @@ module github.com/devfile/devfile-parser
 go 1.14
 
 require (
-	github.com/docker/docker v1.13.1
-	github.com/docker/go-connections v0.4.0
-	github.com/docker/go-units v0.4.0 // indirect
-	github.com/fatih/color v1.9.0
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/ghodss/yaml v1.0.0
 	github.com/gobwas/glob v0.2.3
@@ -15,6 +11,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/afero v1.3.2
 	github.com/xeipuuv/gojsonschema v1.2.0
+	golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect
 	gopkg.in/yaml.v2 v2.3.0
 	k8s.io/api v0.18.6
 	k8s.io/apimachinery v0.18.6
diff --git a/go.sum b/go.sum
index d07205ba..b6d77b60 100644
--- a/go.sum
+++ b/go.sum
@@ -2,19 +2,12 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0
 github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
-github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
 github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -33,6 +26,7 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
@@ -52,15 +46,12 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -78,13 +69,16 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/spf13/afero v1.3.2 h1:GDarE4TJQI52kYSbSAmLiId1Elfj+xgSDqrUZxFhxlU=
 github.com/spf13/afero v1.3.2/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -103,7 +97,6 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7 h1:HmbHVPwrPEKPGLAcHSrMe6+hqSUlvZU0rab6x5EXfGU=
 golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -117,6 +110,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=

From 29b3400c39011d7b88623cb3d8e5041341c8c5dd Mon Sep 17 00:00:00 2001
From: Kanika Rana <krana@redhat.com>
Date: Thu, 23 Jul 2020 14:40:30 -0400
Subject: [PATCH 4/4] updated imports after renaming repo to parser

---
 go.mod                                           | 2 +-
 main.go                                          | 4 ++--
 pkg/devfile/parser/context/apiVersion.go         | 2 +-
 pkg/devfile/parser/context/content_test.go       | 2 +-
 pkg/devfile/parser/context/context.go            | 4 ++--
 pkg/devfile/parser/context/context_test.go       | 2 +-
 pkg/devfile/parser/context/fs.go                 | 2 +-
 pkg/devfile/parser/context/schema.go             | 2 +-
 pkg/devfile/parser/context/schema_test.go        | 2 +-
 pkg/devfile/parser/data/1.0.0/components.go      | 2 +-
 pkg/devfile/parser/data/2.0.0/components.go      | 2 +-
 pkg/devfile/parser/data/2.0.0/components_test.go | 2 +-
 pkg/devfile/parser/data/2.0.0/types.go           | 2 +-
 pkg/devfile/parser/data/2.1.0/components.go      | 2 +-
 pkg/devfile/parser/data/2.1.0/components_test.go | 2 +-
 pkg/devfile/parser/data/2.1.0/types.go           | 2 +-
 pkg/devfile/parser/data/helper_test.go           | 2 +-
 pkg/devfile/parser/data/interface.go             | 2 +-
 pkg/devfile/parser/data/versions.go              | 6 +++---
 pkg/devfile/parser/parse.go                      | 8 ++++----
 pkg/devfile/parser/types.go                      | 4 ++--
 pkg/devfile/parser/writer_test.go                | 6 +++---
 pkg/devfile/validate/components.go               | 2 +-
 pkg/devfile/validate/components_test.go          | 2 +-
 pkg/devfile/validate/validate.go                 | 8 ++++----
 pkg/testingutil/devfile.go                       | 4 ++--
 pkg/util/file_indexer.go                         | 2 +-
 pkg/util/file_indexer_test.go                    | 2 +-
 pkg/util/util.go                                 | 2 +-
 pkg/util/util_test.go                            | 2 +-
 30 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/go.mod b/go.mod
index fb1e2583..9b2b0ae3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/devfile/devfile-parser
+module github.com/devfile/parser
 
 go 1.14
 
diff --git a/main.go b/main.go
index a39df21f..7834287a 100644
--- a/main.go
+++ b/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser"
-	devfileParser "github.com/devfile/devfile-parser/pkg/devfile/parser"
+	"github.com/devfile/parser/pkg/devfile/parser"
+	devfileParser "github.com/devfile/parser/pkg/devfile/parser"
 )
 
 func main() {
diff --git a/pkg/devfile/parser/context/apiVersion.go b/pkg/devfile/parser/context/apiVersion.go
index ca4be7d3..0026ae4e 100644
--- a/pkg/devfile/parser/context/apiVersion.go
+++ b/pkg/devfile/parser/context/apiVersion.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
+	"github.com/devfile/parser/pkg/devfile/parser/data"
 	"github.com/pkg/errors"
 	"k8s.io/klog"
 )
diff --git a/pkg/devfile/parser/context/content_test.go b/pkg/devfile/parser/context/content_test.go
index 74c2c4b0..06c46859 100644
--- a/pkg/devfile/parser/context/content_test.go
+++ b/pkg/devfile/parser/context/content_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/parser/pkg/testingutil/filesystem"
 )
 
 const (
diff --git a/pkg/devfile/parser/context/context.go b/pkg/devfile/parser/context/context.go
index 21e3e8b8..fcd89fbe 100644
--- a/pkg/devfile/parser/context/context.go
+++ b/pkg/devfile/parser/context/context.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"fmt"
 
-	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
-	"github.com/devfile/devfile-parser/pkg/util"
+	"github.com/devfile/parser/pkg/testingutil/filesystem"
+	"github.com/devfile/parser/pkg/util"
 	"k8s.io/klog"
 )
 
diff --git a/pkg/devfile/parser/context/context_test.go b/pkg/devfile/parser/context/context_test.go
index d53741e6..42d62e4a 100644
--- a/pkg/devfile/parser/context/context_test.go
+++ b/pkg/devfile/parser/context/context_test.go
@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/parser/pkg/testingutil/filesystem"
 )
 
 func TestPopulateFromBytes(t *testing.T) {
diff --git a/pkg/devfile/parser/context/fs.go b/pkg/devfile/parser/context/fs.go
index 75a3b3e8..9fab0495 100644
--- a/pkg/devfile/parser/context/fs.go
+++ b/pkg/devfile/parser/context/fs.go
@@ -1,6 +1,6 @@
 package parser
 
-import "github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+import "github.com/devfile/parser/pkg/testingutil/filesystem"
 
 // GetFs returns the filesystem object
 func (d *DevfileCtx) GetFs() filesystem.Filesystem {
diff --git a/pkg/devfile/parser/context/schema.go b/pkg/devfile/parser/context/schema.go
index 925190ef..b021af83 100644
--- a/pkg/devfile/parser/context/schema.go
+++ b/pkg/devfile/parser/context/schema.go
@@ -3,7 +3,7 @@ package parser
 import (
 	"fmt"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
+	"github.com/devfile/parser/pkg/devfile/parser/data"
 	"github.com/pkg/errors"
 	"github.com/xeipuuv/gojsonschema"
 	"k8s.io/klog"
diff --git a/pkg/devfile/parser/context/schema_test.go b/pkg/devfile/parser/context/schema_test.go
index e5e03ae7..2458a09e 100644
--- a/pkg/devfile/parser/context/schema_test.go
+++ b/pkg/devfile/parser/context/schema_test.go
@@ -3,7 +3,7 @@ package parser
 import (
 	"testing"
 
-	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
+	v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
 )
 
 const (
diff --git a/pkg/devfile/parser/data/1.0.0/components.go b/pkg/devfile/parser/data/1.0.0/components.go
index ca533b51..7c20913b 100644
--- a/pkg/devfile/parser/data/1.0.0/components.go
+++ b/pkg/devfile/parser/data/1.0.0/components.go
@@ -3,7 +3,7 @@ package version100
 import (
 	"strings"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 func (d *Devfile100) GetMetadata() common.DevfileMetadata {
diff --git a/pkg/devfile/parser/data/2.0.0/components.go b/pkg/devfile/parser/data/2.0.0/components.go
index 94eaf32b..14d129dc 100644
--- a/pkg/devfile/parser/data/2.0.0/components.go
+++ b/pkg/devfile/parser/data/2.0.0/components.go
@@ -3,7 +3,7 @@ package version200
 import (
 	"strings"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 // GetComponents returns the slice of DevfileComponent objects parsed from the Devfile
diff --git a/pkg/devfile/parser/data/2.0.0/components_test.go b/pkg/devfile/parser/data/2.0.0/components_test.go
index c2565937..f835bc2d 100644
--- a/pkg/devfile/parser/data/2.0.0/components_test.go
+++ b/pkg/devfile/parser/data/2.0.0/components_test.go
@@ -3,7 +3,7 @@ package version200
 import (
 	"testing"
 
-	common "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	common "github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 func TestGetCommands(t *testing.T) {
diff --git a/pkg/devfile/parser/data/2.0.0/types.go b/pkg/devfile/parser/data/2.0.0/types.go
index 81e1b37d..224f1664 100644
--- a/pkg/devfile/parser/data/2.0.0/types.go
+++ b/pkg/devfile/parser/data/2.0.0/types.go
@@ -1,6 +1,6 @@
 package version200
 
-import "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+import "github.com/devfile/parser/pkg/devfile/parser/data/common"
 
 // CommandGroupType describes the kind of command group.
 // +kubebuilder:validation:Enum=build;run;test;debug
diff --git a/pkg/devfile/parser/data/2.1.0/components.go b/pkg/devfile/parser/data/2.1.0/components.go
index 6fab9b9a..af57b35c 100644
--- a/pkg/devfile/parser/data/2.1.0/components.go
+++ b/pkg/devfile/parser/data/2.1.0/components.go
@@ -3,7 +3,7 @@ package version210
 import (
 	"strings"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 // GetComponents returns the slice of DevfileComponent objects parsed from the Devfile
diff --git a/pkg/devfile/parser/data/2.1.0/components_test.go b/pkg/devfile/parser/data/2.1.0/components_test.go
index 29d88136..4baf8b40 100644
--- a/pkg/devfile/parser/data/2.1.0/components_test.go
+++ b/pkg/devfile/parser/data/2.1.0/components_test.go
@@ -3,7 +3,7 @@ package version210
 import (
 	"testing"
 
-	common "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	common "github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 func TestGetCommands(t *testing.T) {
diff --git a/pkg/devfile/parser/data/2.1.0/types.go b/pkg/devfile/parser/data/2.1.0/types.go
index 42dbaef5..a9deae06 100644
--- a/pkg/devfile/parser/data/2.1.0/types.go
+++ b/pkg/devfile/parser/data/2.1.0/types.go
@@ -1,6 +1,6 @@
 package version210
 
-import "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+import "github.com/devfile/parser/pkg/devfile/parser/data/common"
 
 // CommandGroupType describes the kind of command group.
 // +kubebuilder:validation:Enum=build;run;test;debug
diff --git a/pkg/devfile/parser/data/helper_test.go b/pkg/devfile/parser/data/helper_test.go
index ee18a3a8..5f13f41a 100644
--- a/pkg/devfile/parser/data/helper_test.go
+++ b/pkg/devfile/parser/data/helper_test.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
+	v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
 )
 
 func TestNewDevfileData(t *testing.T) {
diff --git a/pkg/devfile/parser/data/interface.go b/pkg/devfile/parser/data/interface.go
index aa2adbe0..77a2a60d 100644
--- a/pkg/devfile/parser/data/interface.go
+++ b/pkg/devfile/parser/data/interface.go
@@ -1,7 +1,7 @@
 package data
 
 import (
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 // DevfileData is an interface that defines functions for Devfile data operations
diff --git a/pkg/devfile/parser/data/versions.go b/pkg/devfile/parser/data/versions.go
index 918dd251..32bf2959 100644
--- a/pkg/devfile/parser/data/versions.go
+++ b/pkg/devfile/parser/data/versions.go
@@ -3,9 +3,9 @@ package data
 import (
 	"reflect"
 
-	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
-	v200 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.0.0"
-	v210 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.1.0"
+	v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
+	v200 "github.com/devfile/parser/pkg/devfile/parser/data/2.0.0"
+	v210 "github.com/devfile/parser/pkg/devfile/parser/data/2.1.0"
 )
 
 // SupportedApiVersions stores the supported devfile API versions
diff --git a/pkg/devfile/parser/parse.go b/pkg/devfile/parser/parse.go
index 33789a63..83e14196 100644
--- a/pkg/devfile/parser/parse.go
+++ b/pkg/devfile/parser/parse.go
@@ -3,10 +3,10 @@ package parser
 import (
 	"encoding/json"
 
-	devfileCtx "github.com/devfile/devfile-parser/pkg/devfile/parser/context"
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
-	"github.com/devfile/devfile-parser/pkg/devfile/validate"
-	"github.com/devfile/devfile-parser/pkg/errors"
+	devfileCtx "github.com/devfile/parser/pkg/devfile/parser/context"
+	"github.com/devfile/parser/pkg/devfile/parser/data"
+	"github.com/devfile/parser/pkg/devfile/validate"
+	"github.com/devfile/parser/pkg/errors"
 )
 
 // ParseDevfile func validates the devfile integrity.
diff --git a/pkg/devfile/parser/types.go b/pkg/devfile/parser/types.go
index 1dfd5452..dd17818b 100644
--- a/pkg/devfile/parser/types.go
+++ b/pkg/devfile/parser/types.go
@@ -1,8 +1,8 @@
 package parser
 
 import (
-	devfileCtx "github.com/devfile/devfile-parser/pkg/devfile/parser/context"
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data"
+	devfileCtx "github.com/devfile/parser/pkg/devfile/parser/context"
+	"github.com/devfile/parser/pkg/devfile/parser/data"
 )
 
 // Default filenames for create devfile
diff --git a/pkg/devfile/parser/writer_test.go b/pkg/devfile/parser/writer_test.go
index a397a9d1..cc0ef305 100644
--- a/pkg/devfile/parser/writer_test.go
+++ b/pkg/devfile/parser/writer_test.go
@@ -3,9 +3,9 @@ package parser
 import (
 	"testing"
 
-	devfileCtx "github.com/devfile/devfile-parser/pkg/devfile/parser/context"
-	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
-	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+	devfileCtx "github.com/devfile/parser/pkg/devfile/parser/context"
+	v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
+	"github.com/devfile/parser/pkg/testingutil/filesystem"
 )
 
 func TestWriteJsonDevfile(t *testing.T) {
diff --git a/pkg/devfile/validate/components.go b/pkg/devfile/validate/components.go
index 6b883044..1cfc1ebf 100644
--- a/pkg/devfile/validate/components.go
+++ b/pkg/devfile/validate/components.go
@@ -3,7 +3,7 @@ package validate
 import (
 	"fmt"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 // Errors
diff --git a/pkg/devfile/validate/components_test.go b/pkg/devfile/validate/components_test.go
index a770a75f..e957301a 100644
--- a/pkg/devfile/validate/components_test.go
+++ b/pkg/devfile/validate/components_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 func TestValidateComponents(t *testing.T) {
diff --git a/pkg/devfile/validate/validate.go b/pkg/devfile/validate/validate.go
index 2ede7bad..42871f8c 100644
--- a/pkg/devfile/validate/validate.go
+++ b/pkg/devfile/validate/validate.go
@@ -3,12 +3,12 @@ package validate
 import (
 	"reflect"
 
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
 	"k8s.io/klog"
 
-	v100 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/1.0.0"
-	v200 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.0.0"
-	v210 "github.com/devfile/devfile-parser/pkg/devfile/parser/data/2.1.0"
+	v100 "github.com/devfile/parser/pkg/devfile/parser/data/1.0.0"
+	v200 "github.com/devfile/parser/pkg/devfile/parser/data/2.0.0"
+	v210 "github.com/devfile/parser/pkg/devfile/parser/data/2.1.0"
 )
 
 // ValidateDevfileData validates whether sections of devfile are odo compatible
diff --git a/pkg/testingutil/devfile.go b/pkg/testingutil/devfile.go
index c8f5ec6d..c764185b 100644
--- a/pkg/testingutil/devfile.go
+++ b/pkg/testingutil/devfile.go
@@ -1,8 +1,8 @@
 package testingutil
 
 import (
-	"github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
-	versionsCommon "github.com/devfile/devfile-parser/pkg/devfile/parser/data/common"
+	"github.com/devfile/parser/pkg/devfile/parser/data/common"
+	versionsCommon "github.com/devfile/parser/pkg/devfile/parser/data/common"
 )
 
 // TestDevfileData is a convenience data type used to mock up a devfile configuration
diff --git a/pkg/util/file_indexer.go b/pkg/util/file_indexer.go
index aff8dd8e..cb77eef5 100644
--- a/pkg/util/file_indexer.go
+++ b/pkg/util/file_indexer.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/parser/pkg/testingutil/filesystem"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/klog"
diff --git a/pkg/util/file_indexer_test.go b/pkg/util/file_indexer_test.go
index 80715e4b..6df96341 100644
--- a/pkg/util/file_indexer_test.go
+++ b/pkg/util/file_indexer_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/parser/pkg/testingutil/filesystem"
 )
 
 func TestCheckGitIgnoreFile(t *testing.T) {
diff --git a/pkg/util/util.go b/pkg/util/util.go
index dcb40561..8c1e9c25 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/devfile/devfile-parser/pkg/testingutil/filesystem"
+	"github.com/devfile/parser/pkg/testingutil/filesystem"
 	"github.com/gobwas/glob"
 	"github.com/google/go-github/github"
 	"github.com/pkg/errors"
diff --git a/pkg/util/util_test.go b/pkg/util/util_test.go
index 89c04621..ce51e8d3 100644
--- a/pkg/util/util_test.go
+++ b/pkg/util/util_test.go
@@ -1969,7 +1969,7 @@ func TestDownloadInMemory(t *testing.T) {
 	}{
 		{
 			name: "Case 1: valid URL",
-			url:  "https://github.com/devfile/devfile-parser/blob/master/devfile.yaml",
+			url:  "https://github.com/devfile/parser/blob/master/devfile.yaml",
 			want: true,
 		},
 		{