From b222dbc1d1df2559206ec1c27928d4666a48f0e8 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 16 Oct 2020 11:05:02 +0200 Subject: [PATCH] Update go-version v1.2.3 -> v1.2.4 (#13169) Co-authored-by: zeripath --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/hashicorp/go-version/README.md | 4 ++-- vendor/github.com/hashicorp/go-version/go.mod | 2 ++ vendor/github.com/hashicorp/go-version/version.go | 12 ++++++++---- vendor/modules.txt | 4 ++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 437b5b0284..6b05d34c58 100644 --- a/go.mod +++ b/go.mod @@ -129,4 +129,4 @@ require ( xorm.io/xorm v1.0.5 ) -replace github.com/hashicorp/go-version => github.com/6543/go-version v1.2.3 +replace github.com/hashicorp/go-version => github.com/6543/go-version v1.2.4 diff --git a/go.sum b/go.sum index 6300b12ac0..abe593297b 100644 --- a/go.sum +++ b/go.sum @@ -71,8 +71,8 @@ gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 h1:N9QFoeNsUXLhl14m gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7/go.mod h1:kgsbFPPS4P+acDYDOPDa3N4IWWOuDJt5/INKRUz7aks= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= -github.com/6543/go-version v1.2.3 h1:uF30BawMhoQLzqBeCwhFcWM6HVxlzMHe/zXbzJeKP+o= -github.com/6543/go-version v1.2.3/go.mod h1:fcfWh4zkneEgGXe8JJptiGwp8l6JgJJgS7oTw6P83So= +github.com/6543/go-version v1.2.4 h1:MPsSnqNrM0HwA9tnmWNnsMdQMg4/u4fflARjwomoof4= +github.com/6543/go-version v1.2.4/go.mod h1:oqFAHCwtLVUTLdhQmVZWYvaHXTdsbB4SY85at64SQEo= github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28= github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= diff --git a/vendor/github.com/hashicorp/go-version/README.md b/vendor/github.com/hashicorp/go-version/README.md index 851a337beb..e19e0a9afc 100644 --- a/vendor/github.com/hashicorp/go-version/README.md +++ b/vendor/github.com/hashicorp/go-version/README.md @@ -1,6 +1,6 @@ # Versioning Library for Go -[![Build Status](https://circleci.com/gh/hashicorp/go-version/tree/master.svg?style=svg)](https://circleci.com/gh/hashicorp/go-version/tree/master) -[![GoDoc](https://godoc.org/github.com/hashicorp/go-version?status.svg)](https://godoc.org/github.com/hashicorp/go-version) +![Build Status](https://github.com/6543/go-version/workflows/Release/badge.svg) +[![GoDoc](https://godoc.org/github.com/6543/go-version?status.svg)](https://godoc.org/github.com/6543/go-version) go-version is a library for parsing versions and version constraints, and verifying versions against a set of constraints. go-version diff --git a/vendor/github.com/hashicorp/go-version/go.mod b/vendor/github.com/hashicorp/go-version/go.mod index f52ad8ac52..fb823e8f9e 100644 --- a/vendor/github.com/hashicorp/go-version/go.mod +++ b/vendor/github.com/hashicorp/go-version/go.mod @@ -1 +1,3 @@ module github.com/6543/go-version + +go 1.15 diff --git a/vendor/github.com/hashicorp/go-version/version.go b/vendor/github.com/hashicorp/go-version/version.go index 1d96a6f71b..3fb63ae802 100644 --- a/vendor/github.com/hashicorp/go-version/version.go +++ b/vendor/github.com/hashicorp/go-version/version.go @@ -18,10 +18,14 @@ var ( // The raw regular expression string used for testing the validity // of a version. const ( - VersionRegexpRaw string = `[vV]?([0-9]+(\.[0-9]+)*?)` + - `(-([0-9]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)|(-?([A-Za-z\-~]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)))?` + - `(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` + - `([\+\.\-~]g[0-9A-Fa-f]{10}$)?` + + VersionRegexpRaw string = `[vV]?` + // Optional [vV] prefix + `([0-9]+(\.[0-9]+)*?)` + // ( MajorNum ( '.' MinorNums ) *? ) + `(-` + // Followed by (optionally): ( '-' + `([0-9]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)` + // Either ( PreNum String ( '.' OtherString ) * ) + `|` + + `([-\.]?([A-Za-z\-~]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)))?` + // Or ( ['-' '.' ] ? ( AlphaHyphenTilde String * ( '.' String ) * ))) ? + `(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` + // and more Optionally: ( '+' String ( '.' String ) * ) + `([\+\.\-~]g[0-9A-Fa-f]{10}$)?` + // Optionally a: ( Punct 'g' Sha ) `?` // SemverRegexpRaw requires a separator between version and prerelease diff --git a/vendor/modules.txt b/vendor/modules.txt index e6a9e1d76f..5c58a018f8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -444,7 +444,7 @@ github.com/hashicorp/go-cleanhttp # github.com/hashicorp/go-retryablehttp v0.6.7 ## explicit github.com/hashicorp/go-retryablehttp -# github.com/hashicorp/go-version v1.2.1 => github.com/6543/go-version v1.2.3 +# github.com/hashicorp/go-version v1.2.1 => github.com/6543/go-version v1.2.4 ## explicit github.com/hashicorp/go-version # github.com/hashicorp/hcl v1.0.0 @@ -1002,4 +1002,4 @@ xorm.io/xorm/log xorm.io/xorm/names xorm.io/xorm/schemas xorm.io/xorm/tags -# github.com/hashicorp/go-version => github.com/6543/go-version v1.2.3 +# github.com/hashicorp/go-version => github.com/6543/go-version v1.2.4