From 2731f46295d512d3aa5f533b7843151840fb980f Mon Sep 17 00:00:00 2001 From: javaducky Date: Thu, 17 Mar 2022 12:53:49 -0500 Subject: [PATCH] Bump version of vendored library --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/Masterminds/semver/v3/CHANGELOG.md | 6 ++++++ .../github.com/Masterminds/semver/v3/constraints.go | 11 ++++------- vendor/modules.txt | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 78a9778..bffff5b 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module go.k6.io/xk6 go 1.16 -require github.com/Masterminds/semver/v3 v3.1.0 +require github.com/Masterminds/semver/v3 v3.1.1 diff --git a/go.sum b/go.sum index ef56648..471bde9 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -github.com/Masterminds/semver/v3 v3.1.0 h1:Y2lUDsFKVRSYGojLJ1yLxSXdMmMYTYls0rCvoqmMUQk= -github.com/Masterminds/semver/v3 v3.1.0/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= +github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= +github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= diff --git a/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md b/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md index 947210d..1f90c38 100644 --- a/vendor/github.com/Masterminds/semver/v3/CHANGELOG.md +++ b/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 diff --git a/vendor/github.com/Masterminds/semver/v3/constraints.go b/vendor/github.com/Masterminds/semver/v3/constraints.go index 7420823..547613f 100644 --- a/vendor/github.com/Masterminds/semver/v3/constraints.go +++ b/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)) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 544c448..108673f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,3 +1,3 @@ -# github.com/Masterminds/semver/v3 v3.1.0 +# github.com/Masterminds/semver/v3 v3.1.1 ## explicit github.com/Masterminds/semver/v3