diff --git a/.travis.yml b/.travis.yml index dde8e3ff0..a6d7303fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ matrix: - go: tip env: - GO111MODULE=on -- GO111MODULE=auto +- GO111MODULE=off addons: ssh_known_hosts: github.com apt: diff --git a/example_test.go b/example_test.go index 6bd12bfbe..8664642e6 100644 --- a/example_test.go +++ b/example_test.go @@ -14,7 +14,6 @@ import ( "time" "github.com/olivere/elastic" - // "github.com/olivere/elastic/v6" // <- with Go modules ) type Tweet struct { diff --git a/go.mod b/go.mod index 04dc55c68..370fd6100 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,8 @@ -module github.com/olivere/elastic/v6 +module github.com/olivere/elastic require ( github.com/fortytw2/leaktest v1.2.0 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 - github.com/olivere/elastic v6.1.25+incompatible github.com/opentracing/opentracing-go v1.0.2 github.com/pkg/errors v0.8.0 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9 diff --git a/recipes/go-modules/main.go b/recipes/go-modules/main.go index e76a13bc9..afb176dcc 100644 --- a/recipes/go-modules/main.go +++ b/recipes/go-modules/main.go @@ -8,7 +8,7 @@ // Example // // -// go run main.go -url=http://127.0.0.1:9200 -sniff=false +// GO111MODULE=on go run main.go -url=http://127.0.0.1:9200 -sniff=false // package main @@ -17,7 +17,7 @@ import ( "fmt" "log" - "github.com/olivere/elastic/v6" + "github.com/olivere/elastic" // <- should end with /v6, but missing due to compatibility reasons ) func main() {