s/masterminds/mattermost for squirrel (#20162)

Our fork of https://github.com/Masterminds/squirrel at https://github.com/mattermost/squirrel (previously https://github.com/lieut-data/squirrel) isn't compatible with the upstream project, and causes issues for repositories importing mattermost-server and using squirrel.

Sidestep this by adopting the `mattermost/squirrel` fork explicitly.  (Downstream repos can either switch, or keep using the upstream version from `Masterminds`.)
Этот коммит содержится в:
Jesse Hallam
2022-05-10 11:48:59 -03:00
коммит произвёл GitHub
родитель 81700598ec
Коммит a4ad6eda5d
36 изменённых файлов: 37 добавлений и 37 удалений

4
go.mod
Просмотреть файл

@@ -5,7 +5,6 @@ go 1.18
require (
code.sajari.com/docconv v1.2.0
github.com/Masterminds/semver/v3 v3.1.1
github.com/Masterminds/squirrel v1.5.2
github.com/avct/uasurfer v0.0.0-20191028135549-26b5daa857f1
github.com/aws/aws-sdk-go v1.44.9
github.com/blang/semver v3.5.1+incompatible
@@ -40,6 +39,7 @@ require (
github.com/mattermost/logr/v2 v2.0.15
github.com/mattermost/morph v0.0.0-20220401091636-39f834798da8
github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0
github.com/mattermost/squirrel v0.2.0
github.com/mholt/archiver/v3 v3.5.1
github.com/microcosm-cc/bluemonday v1.0.18
github.com/minio/minio-go/v7 v7.0.26
@@ -178,8 +178,6 @@ require (
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)
replace github.com/Masterminds/squirrel v1.5.2 => github.com/lieut-data/squirrel v1.5.4
// Hack to prevent the willf/bitset module from being upgraded to 1.2.0.
// They changed the module path from github.com/willf/bitset to
// github.com/bits-and-blooms/bitset and a couple of dependent repos are yet