Fix the import paths to sarama

appservice/consumers/roomserver.go

@@ -27,7 +27,7 @@ import (
 	"github.com/matrix-org/gomatrixserverlib"
 
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.

clientapi/consumers/roomserver.go

@@ -25,7 +25,7 @@ import (
 	"github.com/matrix-org/gomatrixserverlib"
 
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.

clientapi/producers/syncapi.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/matrix-org/dendrite/common"
 
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // SyncAPIProducer produces events for the sync API server to consume

clientapi/producers/userupdate.go

@@ -17,7 +17,7 @@ package producers
 import (
 	"encoding/json"
 
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // UserUpdateProducer produces events related to user updates.

common/basecomponent/base.go

@@ -28,7 +28,7 @@ import (
 	"github.com/matrix-org/dendrite/common"
 
 	"github.com/gorilla/mux"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 
 	appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
 	"github.com/matrix-org/dendrite/common/config"

common/consumers.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // A PartitionOffset is the offset into a partition of the input log.

go.mod

@@ -65,3 +65,5 @@ require (
 	gopkg.in/macaroon.v2 v2.1.0
 	gopkg.in/yaml.v2 v2.2.2
 )
+
+go 1.13

publicroomsapi/consumers/roomserver.go

@@ -23,7 +23,7 @@ import (
 	"github.com/matrix-org/dendrite/publicroomsapi/storage"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.

roomserver/input/input.go

@@ -24,7 +24,7 @@ import (
 	"github.com/matrix-org/dendrite/common"
 	"github.com/matrix-org/dendrite/roomserver/api"
 	"github.com/matrix-org/util"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // RoomserverInputAPI implements api.RoomserverInputAPI

syncapi/consumers/clientapi.go

@@ -24,7 +24,7 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/sync"
 	"github.com/matrix-org/dendrite/syncapi/types"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputClientDataConsumer consumes events that originated in the client API server.

syncapi/consumers/roomserver.go

@@ -27,7 +27,7 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/gomatrixserverlib"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputRoomEventConsumer consumes events that originated in the room server.

syncapi/consumers/typingserver.go

@@ -24,7 +24,7 @@ import (
 	"github.com/matrix-org/dendrite/syncapi/types"
 	"github.com/matrix-org/dendrite/typingserver/api"
 	log "github.com/sirupsen/logrus"
-	sarama "gopkg.in/Shopify/sarama.v1"
+	sarama "github.com/Shopify/sarama"
 )
 
 // OutputTypingEventConsumer consumes events that originated in the typing server.

typingserver/input/input.go

@@ -23,7 +23,7 @@ import (
 	"github.com/matrix-org/dendrite/typingserver/cache"
 	"github.com/matrix-org/gomatrixserverlib"
 	"github.com/matrix-org/util"
-	"gopkg.in/Shopify/sarama.v1"
+	"github.com/Shopify/sarama"
 )
 
 // TypingServerInputAPI implements api.TypingServerInputAPI