move vendored package to v1 folder

google · Jan 14, 2022 · 28e7fde · 28e7fde
1 parent 58222c8
commit 28e7fde
Show file tree

Hide file tree

Showing 14 changed files with 487 additions and 29 deletions.
diff --git a/go.mod b/go.mod
@@ -4,14 +4,15 @@ go 1.13
 
 require (
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/google/go-cmp v0.3.1
+	github.com/google/go-cmp v0.5.6
+	github.com/google/go-replayers/httpreplay v1.0.0
 	github.com/google/licenseclassifier v0.0.0-20210325184830-bb04aff29e72
 	github.com/otiai10/copy v1.2.0
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/crypto v0.0.0-20191117063200-497ca9f6d64f // indirect
-	golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914 // indirect
-	golang.org/x/sys v0.0.0-20191119060738-e882bf8e40c2 // indirect
-	golang.org/x/tools v0.0.0-20191118222007-07fc4c7f2b98
+	go.opencensus.io v0.23.0
+	golang.org/x/mod v0.5.1
+	golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420
+	golang.org/x/tools v0.1.1
 	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