vendoring: isolate the vendor directory

Due to the new vendoring logic in the golang compiler it can cause issues for projects that import a package that has vendored a package that is used locally. See containers/image#223 This change moves the vendored sources to the package that uses them, rather than for the whole project. Also is explictly is not vendoring code repos from "github.com/opencontainers/". For now we'll consider these non-remote. Though versioning may likely be future concern. Fixes opencontainers#527 Obsoletes opencontainers#528 Signed-off-by: Vincent Batts <[email protected]>
vbatts · Jan 26, 2017 · 002d764 · 002d764
1 parent eee8749
commit 002d764
Show file tree

Hide file tree

Showing 45 changed files with 20 additions and 1,022 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/identity/vendor.md b/identity/vendor.md
@@ -0,0 +1,2 @@
+This imports `github.com/opencontainers/go-digest` and has intentionally not
+been vendored.
diff --git a/schema/glide.lock b/schema/glide.lock
diff --git a/glide.yaml → schema/glide.yaml b/glide.yaml → schema/glide.yaml
@@ -1,4 +1,4 @@
-package: github.com/opencontainers/image-spec
+package: github.com/opencontainers/image-spec/schema
 import:
 - package: github.com/pkg/errors
   version: '>=0.7.0'
@@ -8,4 +8,3 @@ import:
   version: ~v1.4
 - package: github.com/shurcooL/sanitized_anchor_name
   version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
-- package: github.com/opencontainers/go-digest
diff --git a/vendor/github.com/pkg/errors/LICENSE → schema/vendor/github.com/pkg/errors/LICENSE b/vendor/github.com/pkg/errors/LICENSE → schema/vendor/github.com/pkg/errors/LICENSE
diff --git a/vendor/github.com/pkg/errors/errors.go → ...ma/vendor/github.com/pkg/errors/errors.go b/vendor/github.com/pkg/errors/errors.go → ...ma/vendor/github.com/pkg/errors/errors.go
diff --git a/vendor/github.com/pkg/errors/stack.go → schema/vendor/github.com/pkg/errors/stack.go b/vendor/github.com/pkg/errors/stack.go → schema/vendor/github.com/pkg/errors/stack.go
diff --git a/...thub.com/russross/blackfriday/LICENSE.txt → ...thub.com/russross/blackfriday/LICENSE.txt b/...thub.com/russross/blackfriday/LICENSE.txt → ...thub.com/russross/blackfriday/LICENSE.txt
diff --git a/.../github.com/russross/blackfriday/block.go → .../github.com/russross/blackfriday/block.go b/.../github.com/russross/blackfriday/block.go → .../github.com/russross/blackfriday/block.go
diff --git a/...r/github.com/russross/blackfriday/html.go → ...r/github.com/russross/blackfriday/html.go b/...r/github.com/russross/blackfriday/html.go → ...r/github.com/russross/blackfriday/html.go
diff --git a/...github.com/russross/blackfriday/inline.go → ...github.com/russross/blackfriday/inline.go b/...github.com/russross/blackfriday/inline.go → ...github.com/russross/blackfriday/inline.go
diff --git a/.../github.com/russross/blackfriday/latex.go → .../github.com/russross/blackfriday/latex.go b/.../github.com/russross/blackfriday/latex.go → .../github.com/russross/blackfriday/latex.go
diff --git a/...thub.com/russross/blackfriday/markdown.go → ...thub.com/russross/blackfriday/markdown.go b/...thub.com/russross/blackfriday/markdown.go → ...thub.com/russross/blackfriday/markdown.go
diff --git a/...b.com/russross/blackfriday/smartypants.go → ...b.com/russross/blackfriday/smartypants.go b/...b.com/russross/blackfriday/smartypants.go → ...b.com/russross/blackfriday/smartypants.go
diff --git a/...om/shurcooL/sanitized_anchor_name/LICENSE → ...om/shurcooL/sanitized_anchor_name/LICENSE b/...om/shurcooL/sanitized_anchor_name/LICENSE → ...om/shurcooL/sanitized_anchor_name/LICENSE
diff --git a/...om/shurcooL/sanitized_anchor_name/main.go → ...om/shurcooL/sanitized_anchor_name/main.go b/...om/shurcooL/sanitized_anchor_name/main.go → ...om/shurcooL/sanitized_anchor_name/main.go
diff --git a/...puuv/gojsonpointer/LICENSE-APACHE-2.0.txt → ...puuv/gojsonpointer/LICENSE-APACHE-2.0.txt b/...puuv/gojsonpointer/LICENSE-APACHE-2.0.txt → ...puuv/gojsonpointer/LICENSE-APACHE-2.0.txt
diff --git a/...thub.com/xeipuuv/gojsonpointer/pointer.go → ...thub.com/xeipuuv/gojsonpointer/pointer.go b/...thub.com/xeipuuv/gojsonpointer/pointer.go → ...thub.com/xeipuuv/gojsonpointer/pointer.go
diff --git a/...uv/gojsonreference/LICENSE-APACHE-2.0.txt → ...uv/gojsonreference/LICENSE-APACHE-2.0.txt b/...uv/gojsonreference/LICENSE-APACHE-2.0.txt → ...uv/gojsonreference/LICENSE-APACHE-2.0.txt
diff --git a/....com/xeipuuv/gojsonreference/reference.go → ....com/xeipuuv/gojsonreference/reference.go b/....com/xeipuuv/gojsonreference/reference.go → ....com/xeipuuv/gojsonreference/reference.go
diff --git a/...ipuuv/gojsonschema/LICENSE-APACHE-2.0.txt → ...ipuuv/gojsonschema/LICENSE-APACHE-2.0.txt b/...ipuuv/gojsonschema/LICENSE-APACHE-2.0.txt → ...ipuuv/gojsonschema/LICENSE-APACHE-2.0.txt
diff --git a/...github.com/xeipuuv/gojsonschema/errors.go → ...github.com/xeipuuv/gojsonschema/errors.go b/...github.com/xeipuuv/gojsonschema/errors.go → ...github.com/xeipuuv/gojsonschema/errors.go
diff --git a/...m/xeipuuv/gojsonschema/format_checkers.go → ...m/xeipuuv/gojsonschema/format_checkers.go b/...m/xeipuuv/gojsonschema/format_checkers.go → ...m/xeipuuv/gojsonschema/format_checkers.go
diff --git a/...b.com/xeipuuv/gojsonschema/internalLog.go → ...b.com/xeipuuv/gojsonschema/internalLog.go b/...b.com/xeipuuv/gojsonschema/internalLog.go → ...b.com/xeipuuv/gojsonschema/internalLog.go
diff --git a/...b.com/xeipuuv/gojsonschema/jsonContext.go → ...b.com/xeipuuv/gojsonschema/jsonContext.go b/...b.com/xeipuuv/gojsonschema/jsonContext.go → ...b.com/xeipuuv/gojsonschema/jsonContext.go
diff --git a/...ub.com/xeipuuv/gojsonschema/jsonLoader.go → ...ub.com/xeipuuv/gojsonschema/jsonLoader.go b/...ub.com/xeipuuv/gojsonschema/jsonLoader.go → ...ub.com/xeipuuv/gojsonschema/jsonLoader.go
diff --git a/...ithub.com/xeipuuv/gojsonschema/locales.go → ...ithub.com/xeipuuv/gojsonschema/locales.go b/...ithub.com/xeipuuv/gojsonschema/locales.go → ...ithub.com/xeipuuv/gojsonschema/locales.go
diff --git a/...github.com/xeipuuv/gojsonschema/result.go → ...github.com/xeipuuv/gojsonschema/result.go b/...github.com/xeipuuv/gojsonschema/result.go → ...github.com/xeipuuv/gojsonschema/result.go
diff --git a/...github.com/xeipuuv/gojsonschema/schema.go → ...github.com/xeipuuv/gojsonschema/schema.go b/...github.com/xeipuuv/gojsonschema/schema.go → ...github.com/xeipuuv/gojsonschema/schema.go
diff --git a/...ub.com/xeipuuv/gojsonschema/schemaPool.go → ...ub.com/xeipuuv/gojsonschema/schemaPool.go b/...ub.com/xeipuuv/gojsonschema/schemaPool.go → ...ub.com/xeipuuv/gojsonschema/schemaPool.go
diff --git a/...ipuuv/gojsonschema/schemaReferencePool.go → ...ipuuv/gojsonschema/schemaReferencePool.go b/...ipuuv/gojsonschema/schemaReferencePool.go → ...ipuuv/gojsonschema/schemaReferencePool.go
diff --git a/...ub.com/xeipuuv/gojsonschema/schemaType.go → ...ub.com/xeipuuv/gojsonschema/schemaType.go b/...ub.com/xeipuuv/gojsonschema/schemaType.go → ...ub.com/xeipuuv/gojsonschema/schemaType.go
diff --git a/...hub.com/xeipuuv/gojsonschema/subSchema.go → ...hub.com/xeipuuv/gojsonschema/subSchema.go b/...hub.com/xeipuuv/gojsonschema/subSchema.go → ...hub.com/xeipuuv/gojsonschema/subSchema.go
diff --git a/.../github.com/xeipuuv/gojsonschema/types.go → .../github.com/xeipuuv/gojsonschema/types.go b/.../github.com/xeipuuv/gojsonschema/types.go → .../github.com/xeipuuv/gojsonschema/types.go
diff --git a/.../github.com/xeipuuv/gojsonschema/utils.go → .../github.com/xeipuuv/gojsonschema/utils.go b/.../github.com/xeipuuv/gojsonschema/utils.go → .../github.com/xeipuuv/gojsonschema/utils.go
diff --git a/...ub.com/xeipuuv/gojsonschema/validation.go → ...ub.com/xeipuuv/gojsonschema/validation.go b/...ub.com/xeipuuv/gojsonschema/validation.go → ...ub.com/xeipuuv/gojsonschema/validation.go
diff --git a/vendor/go4.org/LICENSE → schema/vendor/go4.org/LICENSE b/vendor/go4.org/LICENSE → schema/vendor/go4.org/LICENSE
diff --git a/vendor/go4.org/errorutil/highlight.go → schema/vendor/go4.org/errorutil/highlight.go b/vendor/go4.org/errorutil/highlight.go → schema/vendor/go4.org/errorutil/highlight.go
diff --git a/vendor/github.com/opencontainers/go-digest/LICENSE.code b/vendor/github.com/opencontainers/go-digest/LICENSE.code
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		This imports `github.com/opencontainers/go-digest` and has intentionally not
		been vendored.