From 2a61c1885f139ae69999b798341aff925491402f Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Tue, 4 Jun 2019 08:42:30 -0600 Subject: [PATCH] Fixed nats-server import paths Otherwise, projects pulling nats.go end-up with issues. Resovles #478 Signed-off-by: Ivan Kozlovic --- nats.go | 2 +- nats_test.go | 4 ++-- test/auth_test.go | 4 ++-- test/cluster_test.go | 4 ++-- test/conn_test.go | 4 ++-- test/helper_test.go | 4 ++-- test/reconnect_test.go | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nats.go b/nats.go index 628e6df3d..8785d6da6 100644 --- a/nats.go +++ b/nats.go @@ -43,7 +43,7 @@ import ( // Default Constants const ( - Version = "1.8.0" + Version = "1.8.1" DefaultURL = "nats://127.0.0.1:4222" DefaultPort = 4222 DefaultMaxReconnect = 60 diff --git a/nats_test.go b/nats_test.go index 48e18bc76..4e0d7ed58 100644 --- a/nats_test.go +++ b/nats_test.go @@ -36,8 +36,8 @@ import ( "testing" "time" - "github.com/nats-io/nats-server/server" - natsserver "github.com/nats-io/nats-server/test" + "github.com/nats-io/nats-server/v2/server" + natsserver "github.com/nats-io/nats-server/v2/test" "github.com/nats-io/nkeys" ) diff --git a/test/auth_test.go b/test/auth_test.go index 46b2a7220..4c2f4deac 100644 --- a/test/auth_test.go +++ b/test/auth_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/nats-io/nats-server/server" - "github.com/nats-io/nats-server/test" + "github.com/nats-io/nats-server/v2/server" + "github.com/nats-io/nats-server/v2/test" "github.com/nats-io/nats.go" ) diff --git a/test/cluster_test.go b/test/cluster_test.go index aff3cdd22..af129306a 100644 --- a/test/cluster_test.go +++ b/test/cluster_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/nats-io/nats-server/server" - "github.com/nats-io/nats-server/test" + "github.com/nats-io/nats-server/v2/server" + "github.com/nats-io/nats-server/v2/test" "github.com/nats-io/nats.go" ) diff --git a/test/conn_test.go b/test/conn_test.go index 53250e719..28dc3f848 100644 --- a/test/conn_test.go +++ b/test/conn_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/nats-io/nats-server/server" - "github.com/nats-io/nats-server/test" + "github.com/nats-io/nats-server/v2/server" + "github.com/nats-io/nats-server/v2/test" "github.com/nats-io/nats.go" ) diff --git a/test/helper_test.go b/test/helper_test.go index a09453fca..7c03b3154 100644 --- a/test/helper_test.go +++ b/test/helper_test.go @@ -20,10 +20,10 @@ import ( "strings" "time" - "github.com/nats-io/nats-server/server" + "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" - natsserver "github.com/nats-io/nats-server/test" + natsserver "github.com/nats-io/nats-server/v2/test" ) // So that we can pass tests and benchmarks... diff --git a/test/reconnect_test.go b/test/reconnect_test.go index b062fb6f5..7fd9f84a5 100644 --- a/test/reconnect_test.go +++ b/test/reconnect_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/nats-io/nats-server/server" + "github.com/nats-io/nats-server/v2/server" "github.com/nats-io/nats.go" )