move vendored package to v1 folder

google · Jan 21, 2022 · e0ca1a7 · e0ca1a7
1 parent 7a7a32a
commit e0ca1a7
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 7 deletions.
diff --git a/go.mod b/go.mod
@@ -5,10 +5,14 @@ go 1.16
 require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/google/go-cmp v0.5.6
+	github.com/google/go-replayers/httpreplay v1.0.0
 	github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148
 	github.com/otiai10/copy v1.6.0
 	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/spf13/cobra v1.3.0
+	go.opencensus.io v0.23.0
+	golang.org/x/mod v0.5.1
+	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
 	golang.org/x/tools v0.1.5
 	gopkg.in/src-d/go-git.v4 v4.13.1
 )
diff --git a/go.sum b/go.sum
diff --git a/v2/internal/third_party/pkgsite/LICENSE → internal/third_party/pkgsite/LICENSE b/v2/internal/third_party/pkgsite/LICENSE → internal/third_party/pkgsite/LICENSE
diff --git a/v2/internal/third_party/pkgsite/PATENTS → internal/third_party/pkgsite/PATENTS b/v2/internal/third_party/pkgsite/PATENTS → internal/third_party/pkgsite/PATENTS
diff --git a/v2/internal/third_party/pkgsite/README.md → internal/third_party/pkgsite/README.md b/v2/internal/third_party/pkgsite/README.md → internal/third_party/pkgsite/README.md
diff --git a/...al/third_party/pkgsite/derrors/derrors.go → ...al/third_party/pkgsite/derrors/derrors.go b/...al/third_party/pkgsite/derrors/derrors.go → ...al/third_party/pkgsite/derrors/derrors.go
diff --git a/...ird_party/pkgsite/derrors/derrors_test.go → ...ird_party/pkgsite/derrors/derrors_test.go b/...ird_party/pkgsite/derrors/derrors_test.go → ...ird_party/pkgsite/derrors/derrors_test.go
diff --git a/...l/third_party/pkgsite/source/meta-tags.go → ...l/third_party/pkgsite/source/meta-tags.go b/...l/third_party/pkgsite/source/meta-tags.go → ...l/third_party/pkgsite/source/meta-tags.go
@@ -11,7 +11,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/google/go-licenses/v2/internal/third_party/pkgsite/derrors"
+	"github.com/google/go-licenses/internal/third_party/pkgsite/derrors"
 )
 
 // This code adapted from https://go.googlesource.com/gddo/+/refs/heads/master/gosrc/gosrc.go.

diff --git a/...rnal/third_party/pkgsite/source/source.go → ...rnal/third_party/pkgsite/source/source.go b/...rnal/third_party/pkgsite/source/source.go → ...rnal/third_party/pkgsite/source/source.go
@@ -32,9 +32,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/go-licenses/v2/internal/third_party/pkgsite/derrors"
-	"github.com/google/go-licenses/v2/internal/third_party/pkgsite/stdlib"
-	"github.com/google/go-licenses/v2/internal/third_party/pkgsite/version"
+	"github.com/google/go-licenses/internal/third_party/pkgsite/derrors"
+	"github.com/google/go-licenses/internal/third_party/pkgsite/stdlib"
+	"github.com/google/go-licenses/internal/third_party/pkgsite/version"
 	"go.opencensus.io/plugin/ochttp"
 	"go.opencensus.io/trace"
 	"golang.org/x/net/context/ctxhttp"

diff --git a/...third_party/pkgsite/source/source_test.go → ...third_party/pkgsite/source/source_test.go b/...third_party/pkgsite/source/source_test.go → ...third_party/pkgsite/source/source_test.go
diff --git a/...ite/source/testdata/TestModuleInfo.replay → ...ite/source/testdata/TestModuleInfo.replay b/...ite/source/testdata/TestModuleInfo.replay → ...ite/source/testdata/TestModuleInfo.replay
diff --git a/...rnal/third_party/pkgsite/stdlib/stdlib.go → ...rnal/third_party/pkgsite/stdlib/stdlib.go b/...rnal/third_party/pkgsite/stdlib/stdlib.go → ...rnal/third_party/pkgsite/stdlib/stdlib.go
@@ -12,8 +12,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/google/go-licenses/v2/internal/third_party/pkgsite/derrors"
-	"github.com/google/go-licenses/v2/internal/third_party/pkgsite/version"
+	"github.com/google/go-licenses/internal/third_party/pkgsite/derrors"
+	"github.com/google/go-licenses/internal/third_party/pkgsite/version"
 	"golang.org/x/mod/semver"
 )
 

diff --git a/...third_party/pkgsite/stdlib/stdlib_test.go → ...third_party/pkgsite/stdlib/stdlib_test.go b/...third_party/pkgsite/stdlib/stdlib_test.go → ...third_party/pkgsite/stdlib/stdlib_test.go
diff --git a/...al/third_party/pkgsite/version/version.go → ...al/third_party/pkgsite/version/version.go b/...al/third_party/pkgsite/version/version.go → ...al/third_party/pkgsite/version/version.go