Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updates dependencies to use github.com/mattermost/mattermost-server/v5 #61

Merged
merged 1 commit into from
Jun 22, 2020
Merged

Updates dependencies to use github.com/mattermost/mattermost-server/v5 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,10 @@ go 1.13

require (
bou.ke/monkey v1.0.2
github.com/blang/semver v3.6.1+incompatible // indirect
github.com/gorilla/mux v1.7.3
github.com/mattermost/mattermost-server v1.4.1-0.20191016162522-6597fdb40134 // Mattermost Server 5.16.0
github.com/oklog/run v1.0.1-0.20180308005104-6934b124db28 // indirect
github.com/pkg/errors v0.8.1
github.com/stretchr/testify v1.4.0
github.com/thoas/go-funk v0.5.0
go.uber.org/atomic v1.5.1
go.uber.org/multierr v1.4.0 // indirect
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f // indirect
golang.org/x/tools v0.0.0-20191127201027-ecd32218bd7f // indirect
github.com/gorilla/mux v1.7.4
github.com/mattermost/mattermost-server/v5 v5.24.1
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.6.1
github.com/thoas/go-funk v0.6.0
go.uber.org/atomic v1.6.0
)
440 changes: 336 additions & 104 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion server/command/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
"github.com/mattermost/mattermost-plugin-confluence/server/serializer"
Expand Down
2 changes: 1 addition & 1 deletion server/config/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"strings"

"github.com/mattermost/mattermost-server/plugin"
"github.com/mattermost/mattermost-server/v5/plugin"
"github.com/pkg/errors"
"go.uber.org/atomic"
)
Expand Down
2 changes: 1 addition & 1 deletion server/controller/edit_subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"

"github.com/gorilla/mux"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
"github.com/mattermost/mattermost-plugin-confluence/server/serializer"
Expand Down
2 changes: 1 addition & 1 deletion server/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"

"github.com/gorilla/mux"
"github.com/mattermost/mattermost-server/model"
model "github.com/mattermost/mattermost-server/v5/model"
"github.com/pkg/errors"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
Expand Down
2 changes: 1 addition & 1 deletion server/controller/save_subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"net/http"

"github.com/gorilla/mux"
"github.com/mattermost/mattermost-server/model"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
"github.com/mattermost/mattermost-plugin-confluence/server/serializer"
"github.com/mattermost/mattermost-plugin-confluence/server/service"
"github.com/mattermost/mattermost-server/v5/model"
)

const subscriptionSaveSuccess = "Your subscription has been saved."
Expand Down
7 changes: 3 additions & 4 deletions server/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ import (

"github.com/pkg/errors"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/plugin"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"

"github.com/mattermost/mattermost-plugin-confluence/server/command"
"github.com/mattermost/mattermost-plugin-confluence/server/util"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
"github.com/mattermost/mattermost-plugin-confluence/server/controller"
"github.com/mattermost/mattermost-plugin-confluence/server/util"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions server/plugin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"

"bou.ke/monkey"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/plugin"
"github.com/mattermost/mattermost-server/plugin/plugintest"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"

Expand Down
2 changes: 1 addition & 1 deletion server/serializer/confluence_cloud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"strconv"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
)
Expand Down
2 changes: 1 addition & 1 deletion server/serializer/confluence_event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package serializer

import (
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)

type ConfluenceEvent interface {
Expand Down
2 changes: 1 addition & 1 deletion server/serializer/confluence_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"strings"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
)
Expand Down
1 change: 0 additions & 1 deletion server/service/get_subscription_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"testing"

"bou.ke/monkey"

"github.com/stretchr/testify/assert"

"github.com/mattermost/mattermost-plugin-confluence/server/serializer"
Expand Down
1 change: 0 additions & 1 deletion server/service/get_subscription_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"testing"

"bou.ke/monkey"

"github.com/stretchr/testify/assert"

"github.com/mattermost/mattermost-plugin-confluence/server/serializer"
Expand Down
4 changes: 2 additions & 2 deletions server/service/notification_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

"bou.ke/monkey"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/plugin/plugintest"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"

Expand Down
2 changes: 1 addition & 1 deletion server/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
url2 "net/url"
"time"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/pkg/errors"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
Expand Down
2 changes: 1 addition & 1 deletion server/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"regexp"
"strings"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"

"github.com/mattermost/mattermost-plugin-confluence/server/config"
)
Expand Down