MM-31436: Upgrade dependencies (#16605)

* MM-31436: Upgrade dependencies

Ran make update-dependencies

https://mattermost.atlassian.net/browse/MM-31436

```release-note
NONE
```

* add missing dep

* fix lru marshaling

vendor/github.com/Masterminds/semver/v3/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.1.1 (2020-11-23)
+
+### Fixed
+
+- #158: Fixed issue with generated regex operation order that could cause problem
+
 ## 3.1.0 (2020-04-15)
 
 ### Added

vendor/github.com/Masterminds/semver/v3/constraints.go

@@ -164,14 +164,11 @@ func init() {
 		"^":  constraintCaret,
 	}
 
-	ops := make([]string, 0, len(constraintOps))
-	for k := range constraintOps {
-		ops = append(ops, regexp.QuoteMeta(k))
-	}
+	ops := `=||!=|>|<|>=|=>|<=|=<|~|~>|\^`
 
 	constraintRegex = regexp.MustCompile(fmt.Sprintf(
 		`^\s*(%s)\s*(%s)\s*$`,
-		strings.Join(ops, "|"),
+		ops,
 		cvRegex))
 
 	constraintRangeRegex = regexp.MustCompile(fmt.Sprintf(
@@ -180,12 +177,12 @@ func init() {
 
 	findConstraintRegex = regexp.MustCompile(fmt.Sprintf(
 		`(%s)\s*(%s)`,
-		strings.Join(ops, "|"),
+		ops,
 		cvRegex))
 
 	validConstraintRegex = regexp.MustCompile(fmt.Sprintf(
 		`^(\s*(%s)\s*(%s)\s*\,?)+$`,
-		strings.Join(ops, "|"),
+		ops,
 		cvRegex))
 }
 

vendor/github.com/Masterminds/squirrel/go.mod

@@ -1,5 +1,7 @@
 module github.com/Masterminds/squirrel
 
+go 1.14
+
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0

vendor/github.com/Masterminds/squirrel/select.go

@@ -304,6 +304,16 @@ func (b SelectBuilder) RightJoin(join string, rest ...interface{}) SelectBuilder
 	return b.JoinClause("RIGHT JOIN "+join, rest...)
 }
 
+// InnerJoin adds a INNER JOIN clause to the query.
+func (b SelectBuilder) InnerJoin(join string, rest ...interface{}) SelectBuilder {
+	return b.JoinClause("INNER JOIN "+join, rest...)
+}
+
+// CrossJoin adds a CROSS JOIN clause to the query.
+func (b SelectBuilder) CrossJoin(join string, rest ...interface{}) SelectBuilder {
+	return b.JoinClause("CROSS JOIN "+join, rest...)
+}
+
 // Where adds an expression to the WHERE clause of the query.
 //
 // Expressions are ANDed together in the generated SQL.

vendor/github.com/Masterminds/squirrel/update.go

@@ -86,7 +86,11 @@ func (d *updateData) ToSql() (sqlStr string, args []interface{}, err error) {
 			if err != nil {
 				return "", nil, err
 			}
-			valSql = vsql
+			if _, ok := vs.(SelectBuilder); ok {
+				valSql = fmt.Sprintf("(%s)", vsql)
+			} else {
+				valSql = vsql
+			}
 			args = append(args, vargs...)
 		} else {
 			valSql = "?"