From f32481f68ce378c64b17be23a7e796abdbce5f7d Mon Sep 17 00:00:00 2001 From: Vishal Rana Date: Mon, 12 Mar 2018 13:01:59 -0700 Subject: [PATCH] Revert "Fixed #1078" This reverts commit 8e475454340eba3946ce81bb2a6529467c6ff646. --- Gopkg.lock | 28 +++++++++-------- Gopkg.toml | 89 ++++++++++++++++++++++++++++++++++++++++-------------- echo.go | 2 +- 3 files changed, 83 insertions(+), 36 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index d4217a5d..6404c0c2 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -10,18 +10,17 @@ [[projects]] name = "github.com/dgrijalva/jwt-go" packages = ["."] - revision = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e" - version = "v3.2.0" - -[[projects]] - branch = "master" - name = "github.com/golang/crypto" - packages = ["acme/autocert"] - revision = "c7dcf104e3a7a1417abc0230cb0d5240d764159d" + revision = "dbeaa9332f19a944acb5736b4456cfcc02140e29" + version = "v3.1.0" [[projects]] name = "github.com/labstack/gommon" - packages = ["bytes","color","log","random"] + packages = [ + "bytes", + "color", + "log", + "random" + ] revision = "57409ada9da0f2afad6664c49502f8c50fbd8476" version = "0.2.3" @@ -64,18 +63,21 @@ [[projects]] branch = "master" name = "golang.org/x/crypto" - packages = ["acme"] - revision = "c7dcf104e3a7a1417abc0230cb0d5240d764159d" + packages = [ + "acme", + "acme/autocert" + ] + revision = "91a49db82a88618983a78a06c1cbd4e00ab749ab" [[projects]] branch = "master" name = "golang.org/x/sys" packages = ["unix"] - revision = "7dca6fe1f43775aa6d1334576870ff63f978f539" + revision = "f6cff0780e542efa0c8e864dc8fa522808f6a598" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "e953a862a21c87195c870b3e6c70352bd286dddf76a3a72d0e0b464a259e7a0a" + inputs-digest = "5f74a2a2ba5b07475ad0faa1b4c021b973ad40b2ae749e3d94e15fe839bb440e" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index accdf7d8..a24f61b9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -1,42 +1,87 @@ -# Gopkg.toml example -# -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# +## Gopkg.toml example (these lines may be deleted) + +## "metadata" defines metadata about the project that could be used by other independent +## systems. The metadata defined here will be ignored by dep. +# [metadata] +# key1 = "value that convey data to other systems" +# system1-data = "value that is used by a system" +# system2-data = "value that is used by another system" + +## "required" lists a set of packages (not projects) that must be included in +## Gopkg.lock. This list is merged with the set of packages imported by the current +## project. Use it when your project needs a package it doesn't explicitly import - +## including "main" packages. # required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# + +## "ignored" lists a set of packages (not projects) that are ignored when +## dep statically analyzes source code. Ignored packages can be in this project, +## or in a dependency. +# ignored = ["github.com/user/project/badpkg"] + +## Constraints are rules for how directly imported projects +## may be incorporated into the depgraph. They are respected by +## dep whether coming from the Gopkg.toml of the current project or a dependency. # [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" +## Required: the root import path of the project being constrained. +# name = "github.com/user/project" # -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" +## Recommended: the version constraint to enforce for the project. +## Only one of "branch", "version" or "revision" can be specified. +# version = "1.0.0" +# branch = "master" +# revision = "abc123" # +## Optional: an alternate location (URL or import path) for the project's source. +# source = "https://github.com/myfork/package.git" +# +## "metadata" defines metadata about the dependency or override that could be used +## by other independent systems. The metadata defined here will be ignored by dep. +# [metadata] +# key1 = "value that convey data to other systems" +# system1-data = "value that is used by a system" +# system2-data = "value that is used by another system" + +## Overrides have the same structure as [[constraint]], but supersede all +## [[constraint]] declarations from all projects. Only [[override]] from +## the current project's are applied. +## +## Overrides are a sledgehammer. Use them only as a last resort. # [[override]] -# name = "github.com/x/y" -# version = "2.4.0" +## Required: the root import path of the project being constrained. +# name = "github.com/user/project" +# +## Optional: specifying a version constraint override will cause all other +## constraints on this project to be ignored; only the overridden constraint +## need be satisfied. +## Again, only one of "branch", "version" or "revision" can be specified. +# version = "1.0.0" +# branch = "master" +# revision = "abc123" +# +## Optional: specifying an alternate source location as an override will +## enforce that the alternate location is used for that project, regardless of +## what source location any dependent projects specify. +# source = "https://github.com/myfork/package.git" + [[constraint]] name = "github.com/dgrijalva/jwt-go" - version = "3.2.0" - -[[constraint]] - branch = "master" - name = "github.com/golang/crypto" + version = "3.0.0" [[constraint]] name = "github.com/labstack/gommon" - version = "0.2.3" + version = "0.2.1" [[constraint]] name = "github.com/stretchr/testify" - version = "1.2.1" + version = "1.1.4" [[constraint]] branch = "master" name = "github.com/valyala/fasttemplate" + +[[constraint]] + branch = "master" + name = "golang.org/x/crypto" diff --git a/echo.go b/echo.go index 630497e8..4ea44b42 100644 --- a/echo.go +++ b/echo.go @@ -52,9 +52,9 @@ import ( "sync" "time" - "github.com/golang/crypto/acme/autocert" "github.com/labstack/gommon/color" "github.com/labstack/gommon/log" + "golang.org/x/crypto/acme/autocert" ) type (