Cherry-pick elastic#8619 to 6.4: Vendorize goimports (elastic#8632)

Vendorize goimports (elastic#8619 and elastic#8626) Co-authored-by: Gil Raphaelli <g@raphaelli.com> (cherry picked from commits 6172a96 and e7f620f)
leweafan · Oct 17, 2018 · 5013e8d · 5013e8d
1 parent b78e3f5
commit 5013e8d
Show file tree

Hide file tree

Showing 18 changed files with 12,392 additions and 11 deletions.
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -2677,8 +2677,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------
 Dependency: golang.org/x/tools
-Version: release-branch.go1.9
-Revision: 5d2fd3ccab986d52112bf301d47a819783339d0e
+Version: release-branch.go1.10
+Revision: 156d532d4f67148ceab07c3b59ed7fa13bdbf00c
 License type (autodetected): BSD-3-Clause
 ./vendor/golang.org/x/tools/LICENSE:
 --------------------------------------------------------------------

diff --git a/libbeat/scripts/Makefile b/libbeat/scripts/Makefile
@@ -48,7 +48,7 @@ LIBCOMPOSE_TOOL_REPO?=github.com/docker/libcompose
 NOW=$(shell date -u '+%Y-%m-%dT%H:%M:%SZ')
 GOBUILD_FLAGS?=-i -ldflags "-X github.com/elastic/beats/libbeat/version.buildTime=$(NOW) -X github.com/elastic/beats/libbeat/version.commit=$(COMMIT_ID)"
 GOIMPORTS=goimports
-GOIMPORTS_REPO?=golang.org/x/tools/cmd/goimports
+GOIMPORTS_REPO?=github.com/elastic/beats/vendor/golang.org/x/tools/cmd/goimports
 GOIMPORTS_LOCAL_PREFIX?=github.com/elastic
 GOLINT=golint
 GOLINT_REPO?=github.com/golang/lint/golint

diff --git a/vendor/golang.org/x/tools/cmd/goimports/doc.go b/vendor/golang.org/x/tools/cmd/goimports/doc.go