fix(build): fixed dependency and build issue

pkg/api/api.go

@@ -1,11 +1,11 @@
 package api
 
 import (
-	"gopkg.in/macaron.v1"
+	"github.com/go-macaron/binding"
 	"github.com/grafana/grafana/pkg/api/dtos"
 	"github.com/grafana/grafana/pkg/middleware"
 	m "github.com/grafana/grafana/pkg/models"
-	"github.com/go-macaron/binding"
+	"gopkg.in/macaron.v1"
 )
 
 // Register adds http routes

pkg/api/common.go

@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"gopkg.in/macaron.v1"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/metrics"
 	"github.com/grafana/grafana/pkg/middleware"
 	"github.com/grafana/grafana/pkg/setting"
+	"gopkg.in/macaron.v1"
 )
 
 var (

pkg/middleware/logger.go

@@ -20,9 +20,9 @@ import (
 	"net/http"
 	"time"
 
-	"gopkg.in/macaron.v1"
 	"github.com/grafana/grafana/pkg/log"
 	"github.com/grafana/grafana/pkg/setting"
+	"gopkg.in/macaron.v1"
 )
 
 func Logger() macaron.Handler {

pkg/middleware/middleware_test.go

@@ -7,13 +7,13 @@ import (
 	"path/filepath"
 	"testing"
 
-	"gopkg.in/macaron.v1"
+	"github.com/go-macaron/session"
 	"github.com/grafana/grafana/pkg/bus"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/util"
-	"github.com/macaron-contrib/session"
 	. "github.com/smartystreets/goconvey/convey"
+	"gopkg.in/macaron.v1"
 )
 
 func TestMiddlewareContext(t *testing.T) {

pkg/middleware/quota.go

@@ -3,11 +3,11 @@ package middleware
 import (
 	"fmt"
 
-	"gopkg.in/macaron.v1"
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/log"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/setting"
+	"gopkg.in/macaron.v1"
 )
 
 func Quota(target string) macaron.Handler {

pkg/middleware/session.go

@@ -3,12 +3,12 @@ package middleware
 import (
 	"time"
 
-	"gopkg.in/macaron.v1"
 	"github.com/go-macaron/session"
 	_ "github.com/go-macaron/session/memcache"
 	_ "github.com/go-macaron/session/mysql"
 	_ "github.com/go-macaron/session/postgres"
 	_ "github.com/go-macaron/session/redis"
+	"gopkg.in/macaron.v1"
 )
 
 const (

pkg/middleware/util.go

@@ -3,8 +3,8 @@ package middleware
 import (
 	"strings"
 
-	"gopkg.in/macaron.v1"
 	"github.com/go-macaron/gzip"
+	"gopkg.in/macaron.v1"
 )
 
 func Gziper() macaron.Handler {