From 155d0ec1f9051a669d1f6c09d665afa8a800203b Mon Sep 17 00:00:00 2001 From: Lenny Goodell Date: Thu, 2 Jun 2022 16:14:05 -0700 Subject: [PATCH] build: Update chnage log and released go mods for 2.1.1 patch (#4042) Signed-off-by: Leonard Goodell --- CHANGELOG.md | 22 ++++++++++++++----- go.mod | 8 +++---- go.sum | 16 +++++++------- .../go-mod-core-contracts/v2/dtos/address.go | 2 +- vendor/modules.txt | 8 +++---- 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46f0a0efe5..c9c478f1bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,12 +5,22 @@ ## Change Logs for EdgeX Dependencies -- [go-mod-bootstrap](https://github.com/edgexfoundry/go-mod-bootstrap/blob/main/CHANGELOG.md) -- [go-mod-core-contracts](https://github.com/edgexfoundry/go-mod-core-contracts/blob/main/CHANGELOG.md) -- [go-mod-messaging](https://github.com/edgexfoundry/go-mod-messaging/blob/main/CHANGELOG.md) -- [go-mod-registry](https://github.com/edgexfoundry/go-mod-registry/blob/main/CHANGELOG.md) -- [go-mod-secrets](https://github.com/edgexfoundry/go-mod-secrets/blob/main/CHANGELOG.md) -- [go-mod-configuration](https://github.com/edgexfoundry/go-mod-configuration/blob/main/CHANGELOG.md) (indirect dependency) +- [go-mod-bootstrap](https://github.com/edgexfoundry/go-mod-bootstrap/blob/jakarta/CHANGELOG.md) +- [go-mod-core-contracts](https://github.com/edgexfoundry/go-mod-core-contracts/blob/jakarta/CHANGELOG.md) +- [go-mod-messaging](https://github.com/edgexfoundry/go-mod-messaging/blob/jakarta/CHANGELOG.md) +- [go-mod-registry](https://github.com/edgexfoundry/go-mod-registry/blob/jakarta/CHANGELOG.md) +- [go-mod-secrets](https://github.com/edgexfoundry/go-mod-secrets/blob/jakarta/CHANGELOG.md) +- [go-mod-configuration](https://github.com/edgexfoundry/go-mod-configuration/blob/jakarta/CHANGELOG.md) (indirect dependency) + +## [v2.1.1] Jakarta - 2022-06-08 (Only compatible with the 2.x release) + +### Bug Fixes 🐛 + +- **data:** Use deepCopy of messageBusInfo to avoid external adds ([#4039](https://github.com/edgexfoundry/edgex-go/issues/4039)) ([#720c6cf9](https://github.com/edgexfoundry/edgex-go/commits/720c6cf9)) + +### Build 👷 + +- Update go-mod versions for those that changed for 2.1.1 patch ([#f08ebb17](https://github.com/edgexfoundry/edgex-go/commits/f08ebb17)) ## [v2.1.0] Jakarta - 2021-11-17 (Only compatible with the 2.x release) diff --git a/go.mod b/go.mod index 598e741d70..125dee1bcd 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,11 @@ module github.com/edgexfoundry/edgex-go require ( bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690 - github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1-dev.2 - github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.0 - github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1-dev.2 + github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1 + github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.1 + github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1 github.com/edgexfoundry/go-mod-registry/v2 v2.1.0 - github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1-dev.1 + github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1 github.com/fxamacker/cbor/v2 v2.3.0 github.com/golang-jwt/jwt/v4 v4.1.0 github.com/gomodule/redigo v2.0.0+incompatible diff --git a/go.sum b/go.sum index 22f4dccf61..e10c74cffc 100644 --- a/go.sum +++ b/go.sum @@ -50,18 +50,18 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqnNN1bdl41Y= github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc= -github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1-dev.2 h1:WW6/dJCD3TmVy9ns5ENPtlw46kjC0VL9GtOONJ7kaw8= -github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1-dev.2/go.mod h1:mxSdhPokUEIl06xD6yWKG+QGPBXZNAxjLQFkR0wppgA= +github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1 h1:9EpSr+hpqDWhHnKTIu7q98LEZEfXcCHy0Jo3SXsS2Ns= +github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1/go.mod h1:aJ9CnraKFjP8IEIc75d1zRZa0OIjsnznPjrms/9kC80= github.com/edgexfoundry/go-mod-configuration/v2 v2.1.0 h1:wiLtHYo1QxImARJZt7TYj88cUhq1ANh8se4TBvFsYvw= github.com/edgexfoundry/go-mod-configuration/v2 v2.1.0/go.mod h1:MvHit0MxBXN4bC8LL0NZRsw72ByRE1XwtVLQP9C+2vg= -github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.0 h1:uphot3ZKOH0/aoo/Y5gr2NCRgGzy9RksWsXKtJRVEuQ= -github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.0/go.mod h1:I6UhBPCREubcU0ouIGBdZlNG5Xx4NijUVN5rvEtD03k= -github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1-dev.2 h1:1dW04cssT3AuEOcIFAiS5WTnMwYg6OCaf1LOC5sryxI= -github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1-dev.2/go.mod h1:bLKWB9yeOHLZoQtHLZlGwz8MjsMJIvHDFce7CcUb4fE= +github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.1 h1:L/e+aJXU5U3Uso/az2BJBhN9+2JRckqMpYB+6sqZv1k= +github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.1/go.mod h1:I6UhBPCREubcU0ouIGBdZlNG5Xx4NijUVN5rvEtD03k= +github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1 h1:f/lr2gCyuLXeRx7KhoLun0Yhu9VjiFKwNT3QNacZfmg= +github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1/go.mod h1:bLKWB9yeOHLZoQtHLZlGwz8MjsMJIvHDFce7CcUb4fE= github.com/edgexfoundry/go-mod-registry/v2 v2.1.0 h1:ks0ejtLLUYKuoKrUBbWxygCU7q2mBFJlHE/+dEzV2Gw= github.com/edgexfoundry/go-mod-registry/v2 v2.1.0/go.mod h1:+MNlQm8Ks9ZmxqrMK4O3KdBA6E7nRK9M+qBtv/1lPcA= -github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1-dev.1 h1:wFZtPwdvuW7z73OYNVMZiwlLcs47fwo3/DnkvRiuJs8= -github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1-dev.1/go.mod h1:ZrbY5j9qrotIO+ymMsuUBAgXl8t7FBJ5lQm5WTKPGZk= +github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1 h1:1HD4rOWRiy3JwBWgDT4UPsx9ddab/lPZm9ySQ7TsaFQ= +github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1/go.mod h1:QR2JmTi94Qb4ti60GqioMvwSIxJxTAmJkhnp1AgTNDk= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= diff --git a/vendor/github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/address.go b/vendor/github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/address.go index 935c1fc279..5abc009e82 100644 --- a/vendor/github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/address.go +++ b/vendor/github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/address.go @@ -54,7 +54,7 @@ func (a *Address) Validate() error { type RESTAddress struct { Path string `json:"path,omitempty"` - HTTPMethod string `json:"httpMethod,omitempty" validate:"required,oneof='GET' 'HEAD' 'POST' 'PUT' 'DELETE' 'TRACE' 'CONNECT'"` + HTTPMethod string `json:"httpMethod,omitempty" validate:"required,oneof='GET' 'HEAD' 'POST' 'PUT' 'PATCH' 'DELETE' 'TRACE' 'CONNECT'"` } func NewRESTAddress(host string, port int, httpMethod string) Address { diff --git a/vendor/modules.txt b/vendor/modules.txt index ef9ecfc727..65ba49dec2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -10,7 +10,7 @@ github.com/davecgh/go-spew/spew # github.com/eclipse/paho.mqtt.golang v1.3.5 github.com/eclipse/paho.mqtt.golang github.com/eclipse/paho.mqtt.golang/packets -# github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1-dev.2 +# github.com/edgexfoundry/go-mod-bootstrap/v2 v2.1.1 ## explicit github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/config @@ -30,7 +30,7 @@ github.com/edgexfoundry/go-mod-bootstrap/v2/di github.com/edgexfoundry/go-mod-configuration/v2/configuration github.com/edgexfoundry/go-mod-configuration/v2/internal/pkg/consul github.com/edgexfoundry/go-mod-configuration/v2/pkg/types -# github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.0 +# github.com/edgexfoundry/go-mod-core-contracts/v2 v2.1.1 ## explicit github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http github.com/edgexfoundry/go-mod-core-contracts/v2/clients/http/utils @@ -44,7 +44,7 @@ github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/requests github.com/edgexfoundry/go-mod-core-contracts/v2/dtos/responses github.com/edgexfoundry/go-mod-core-contracts/v2/errors github.com/edgexfoundry/go-mod-core-contracts/v2/models -# github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1-dev.2 +# github.com/edgexfoundry/go-mod-messaging/v2 v2.1.1 ## explicit github.com/edgexfoundry/go-mod-messaging/v2/internal/pkg github.com/edgexfoundry/go-mod-messaging/v2/internal/pkg/mqtt @@ -58,7 +58,7 @@ github.com/edgexfoundry/go-mod-registry/v2/internal/pkg/consul github.com/edgexfoundry/go-mod-registry/v2/pkg/types github.com/edgexfoundry/go-mod-registry/v2/registry github.com/edgexfoundry/go-mod-registry/v2/registry/mocks -# github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1-dev.1 +# github.com/edgexfoundry/go-mod-secrets/v2 v2.1.1 ## explicit github.com/edgexfoundry/go-mod-secrets/v2/internal/pkg/vault github.com/edgexfoundry/go-mod-secrets/v2/pkg