Skip to content

Commit e1adba9

Browse files
authored
[MM-52924] Update mattermost server dependency (#29)
* Update mattermost server dependency * Bump server dep to feature branch * Use new module path for server
1 parent 8f1026f commit e1adba9

13 files changed

+59
-54
lines changed

go.mod

+15-13
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ require (
99
github.com/docker/docker v20.10.9+incompatible
1010
github.com/gorilla/mux v1.8.0
1111
github.com/kelseyhightower/envconfig v1.4.0
12-
github.com/mattermost/calls-recorder v0.3.0
13-
github.com/mattermost/mattermost-server/v6 v6.0.0-20221122212622-0509e78744bf
12+
github.com/mattermost/calls-recorder v0.3.2
13+
github.com/mattermost/mattermost/server/public v0.0.0-20230613002302-62a3ee8adcb5
1414
github.com/pborman/uuid v1.2.1
15-
github.com/stretchr/testify v1.8.1
16-
golang.org/x/crypto v0.2.0
15+
github.com/stretchr/testify v1.8.2
16+
golang.org/x/crypto v0.8.0
1717
)
1818

1919
require (
@@ -27,25 +27,27 @@ require (
2727
github.com/francoispqt/gojay v1.2.13 // indirect
2828
github.com/gofrs/flock v0.8.0 // indirect
2929
github.com/gogo/protobuf v1.3.2 // indirect
30-
github.com/golang/protobuf v1.5.2 // indirect
31-
github.com/google/go-cmp v0.5.7 // indirect
30+
github.com/golang/protobuf v1.5.3 // indirect
3231
github.com/google/uuid v1.3.0 // indirect
33-
github.com/mattermost/logr/v2 v2.0.15 // indirect
32+
github.com/gopherjs/gopherjs v1.17.2 // indirect
33+
github.com/kr/text v0.2.0 // indirect
34+
github.com/mattermost/logr/v2 v2.0.16 // indirect
3435
github.com/morikuni/aec v1.0.0 // indirect
3536
github.com/opencontainers/go-digest v1.0.0 // indirect
3637
github.com/opencontainers/image-spec v1.0.1 // indirect
3738
github.com/pkg/errors v0.9.1 // indirect
3839
github.com/plar/go-adaptive-radix-tree v1.0.4 // indirect
3940
github.com/pmezard/go-difflib v1.0.0 // indirect
41+
github.com/rogpeppe/go-internal v1.8.0 // indirect
4042
github.com/sirupsen/logrus v1.9.0 // indirect
4143
github.com/wiggin77/merror v1.0.4 // indirect
4244
github.com/wiggin77/srslog v1.0.1 // indirect
4345
golang.org/x/exp v0.0.0-20200908183739-ae8ad444f925 // indirect
44-
golang.org/x/net v0.2.0 // indirect
45-
golang.org/x/sys v0.2.0 // indirect
46-
google.golang.org/genproto v0.0.0-20221114212237-e4508ebdbee1 // indirect
47-
google.golang.org/grpc v1.50.1 // indirect
48-
google.golang.org/protobuf v1.28.1 // indirect
49-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
46+
golang.org/x/net v0.9.0 // indirect
47+
golang.org/x/sys v0.7.0 // indirect
48+
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
49+
google.golang.org/grpc v1.54.0 // indirect
50+
google.golang.org/protobuf v1.30.0 // indirect
51+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
5052
gopkg.in/yaml.v3 v3.0.1 // indirect
5153
)

go.sum

+33-30
Large diffs are not rendered by default.

logger/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"strings"
99

10-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
10+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1111
)
1212

1313
// Config holds information used to initialize a new logger.

logger/logger.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"strings"
1010

11-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
11+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1212
)
1313

1414
func getLevels(level string) []mlog.Level {

logger/logger_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/stretchr/testify/require"
1010

11-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
11+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1212
)
1313

1414
func TestGetLevels(t *testing.T) {

service/api/server.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"net/http"
1212
"time"
1313

14-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
14+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1515
)
1616

1717
type Server struct {

service/api/server_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"net/http"
1010
"testing"
1111

12-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
12+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1313
"github.com/stretchr/testify/require"
1414
)
1515

service/audit.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"net/http"
1010

11-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
11+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1212
)
1313

1414
type httpData struct {

service/auth.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"net/http"
1111
"strings"
1212

13-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
13+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1414
)
1515

1616
const bearerPrefix = "Bearer "

service/jobs_api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/gorilla/mux"
1313

14-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
14+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1515
)
1616

1717
func (s *Service) handleCreateJob(w http.ResponseWriter, r *http.Request) {

service/jobs_service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/mattermost/calls-offloader/service/random"
1818
recorder "github.com/mattermost/calls-recorder/cmd/recorder/config"
1919

20-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
20+
"github.com/mattermost/mattermost/server/public/shared/mlog"
2121

2222
"github.com/docker/docker/api/types"
2323
"github.com/docker/docker/api/types/container"

service/service.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/mattermost/calls-offloader/service/auth"
1313
"github.com/mattermost/calls-offloader/service/store"
1414

15-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
15+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1616

1717
"github.com/gorilla/mux"
1818
)

service/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99
"runtime"
1010

11-
"github.com/mattermost/mattermost-server/v6/shared/mlog"
11+
"github.com/mattermost/mattermost/server/public/shared/mlog"
1212
)
1313

1414
var (

0 commit comments

Comments
 (0)