Skip to content

Commit

Permalink
Merge pull request #351 from weichou1229/v4-module
Browse files Browse the repository at this point in the history
refactor!: update module to v4
  • Loading branch information
cloudxxx8 authored Oct 30, 2024
2 parents e9e33d8 + 762c735 commit 1187227
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 73 deletions.
10 changes: 5 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ updates:
schedule:
interval: "daily"
ignore:
- dependency-name: "github.com/edgexfoundry/go-mod-core-contracts/v3"
- dependency-name: "github.com/edgexfoundry/go-mod-core-contracts/v4"
# Included when device-sdk-go is updated
- dependency-name: "github.com/edgexfoundry/go-mod-messaging/v3"
- dependency-name: "github.com/edgexfoundry/go-mod-messaging/v4"
# Included when device-sdk-go is updated
- dependency-name: "github.com/edgexfoundry/go-mod-registry/v3"
- dependency-name: "github.com/edgexfoundry/go-mod-registry/v4"
# Included when device-sdk-go is updated
- dependency-name: "github.com/edgexfoundry/go-mod-secrets/v3"
- dependency-name: "github.com/edgexfoundry/go-mod-secrets/v4"
# Included when device-sdk-go is updated
- dependency-name: "github.com/edgexfoundry/go-mod-bootstrap/v3"
- dependency-name: "github.com/edgexfoundry/go-mod-bootstrap/v4"
# Included when device-sdk-go is updated
14 changes: 7 additions & 7 deletions Attribution.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ The following open source projects are referenced by Device Service SNMP Go:
cenkalti/backoff (MIT) https://github.com/cenkalti/backoff
https://github.com/cenkalti/backoff/blob/master/LICENSE

edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v3
edgexfoundry/go-mod-core-contracts (Apache 2.0) https://github.com/edgexfoundry/go-mod-core-contracts/v4
https://github.com/edgexfoundry/go-mod-core-contracts/blob/master/LICENSE

edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v3
edgexfoundry/go-mod-registry (Apache 2.0) https://github.com/edgexfoundry/go-mod-registry/v4
https://github.com/edgexfoundry/go-mod-registry/blob/master/LICENSE

edgexfoundry/device-sdk-go (Apache 2.0) https://github.com/edgexfoundry/device-sdk-go/v3
edgexfoundry/device-sdk-go (Apache 2.0) https://github.com/edgexfoundry/device-sdk-go/v4
https://github.com/edgexfoundry/device-sdk-go/blob/master/LICENSE

go-kit/kit (MIT) github.com/go-kit/kit
Expand Down Expand Up @@ -72,13 +72,13 @@ https://github.com/OneOfOne/xxhash/blob/master/LICENCE
hashicorp/consul/api (Mozilla Public License 2.0) https://github.com/hashicorp/consul/api
https://github.com/hashicorp/consul/blob/master/LICENSE

edgexfoundry/go-mod-bootstrap (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v3
edgexfoundry/go-mod-bootstrap (Apache 2.0) https://github.com/edgexfoundry/go-mod-bootstrap/v4
https://github.com/edgexfoundry/go-mod-bootstrap/blob/master/LICENSE

edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v3
edgexfoundry/go-mod-secrets (Apache 2.0) https://github.com/edgexfoundry/go-mod-secrets/v4
https://github.com/edgexfoundry/go-mod-secrets/blob/master/LICENSE

edgexfoundry/go-mod-configuration (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v3
edgexfoundry/go-mod-configuration (Apache 2.0) https://github.com/edgexfoundry/go-mod-configuration/v4
https://github.com/edgexfoundry/go-mod-configuration/blob/master/LICENSE

fxamacker/cbor (MIT) https://github.com/fxamacker/cbor/v2
Expand All @@ -102,7 +102,7 @@ https://github.com/go-playground/validator/blob/master/LICENSE
leodido/go-urn (MIT) https://github.com/leodido/go-urn
https://github.com/leodido/go-urn

edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v3
edgexfoundry/go-mod-messaging (Apache 2.0) https://github.com/edgexfoundry/go-mod-messaging/v4
https://github.com/edgexfoundry/go-mod-messaging/blob/master/LICENSE

golang.org/x/net (Unspecified) https://github.com/golang/net
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ EXPOSE 59993
EXPOSE 161

ENTRYPOINT ["/device-snmp"]
CMD ["--cp=consul.http://edgex-core-consul:8500", "--registry"]
CMD ["-cp=keeper.http://edgex-core-keeper:59890", "--registry"]
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ DOCKERS=docker_device_snmp_go

# This pulls the version of the SDK from the go.mod file. It works by looking for the line
# with the SDK and printing just the version number that comes after it.
SDKVERSION=$(shell sed -En 's|.*github.com/edgexfoundry/device-sdk-go/v3 (v[\.0-9a-zA-Z-]+).*|\1|p' go.mod)
SDKVERSION=$(shell sed -En 's|.*github.com/edgexfoundry/device-sdk-go/v4 (v[\.0-9a-zA-Z-]+).*|\1|p' go.mod)

# this pulls the version from local VERSION file that is created by the Jenkins Pipeline.
VERSION=$(shell cat ./VERSION 2>/dev/null || echo 0.0.0)

GIT_SHA=$(shell git rev-parse HEAD)

GOFLAGS=-ldflags "-X github.com/edgexfoundry/device-snmp-go.Version=$(VERSION) \
-X github.com/edgexfoundry/device-sdk-go/v3/internal/common.SDKVersion=$(SDKVERSION)" \
-X github.com/edgexfoundry/device-sdk-go/v4/internal/common.SDKVersion=$(SDKVERSION)" \
-trimpath -mod=readonly

build: $(MICROSERVICES)
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package main

import (
"github.com/edgexfoundry/device-sdk-go/v3/pkg/startup"
"github.com/edgexfoundry/device-sdk-go/v4/pkg/startup"

device_snmp_go "github.com/edgexfoundry/device-snmp-go"
"github.com/edgexfoundry/device-snmp-go/internal/driver"
Expand Down
34 changes: 17 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/edgexfoundry/device-snmp-go
go 1.23

require (
github.com/edgexfoundry/device-sdk-go/v3 v3.2.0-dev.41
github.com/edgexfoundry/go-mod-core-contracts/v3 v3.2.0-dev.47
github.com/edgexfoundry/device-sdk-go/v4 v4.0.0-dev.1
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.2
github.com/soniah/gosnmp v1.21.0
)

Expand All @@ -16,17 +16,17 @@ require (
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v3 v3.2.0-dev.60 // indirect
github.com/edgexfoundry/go-mod-configuration/v3 v3.2.0-dev.17 // indirect
github.com/edgexfoundry/go-mod-messaging/v3 v3.2.0-dev.37 // indirect
github.com/edgexfoundry/go-mod-registry/v3 v3.2.0-dev.16 // indirect
github.com/edgexfoundry/go-mod-secrets/v3 v3.2.0-dev.13 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.2 // indirect
github.com/edgexfoundry/go-mod-registry/v4 v4.0.0-dev.1 // indirect
github.com/edgexfoundry/go-mod-secrets/v4 v4.0.0-dev.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
github.com/go-jose/go-jose/v4 v4.0.4 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
Expand Down Expand Up @@ -68,7 +68,7 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/kataras/go-events v0.0.3 // indirect
github.com/klauspost/compress v1.17.2 // indirect
github.com/labstack/echo/v4 v4.11.4 // indirect
github.com/labstack/echo/v4 v4.12.0 // indirect
github.com/labstack/gommon v0.4.2 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
Expand Down Expand Up @@ -109,7 +109,7 @@ require (
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/speps/go-hashids v2.0.0+incompatible // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spiffe/go-spiffe/v2 v2.3.0 // indirect
github.com/spiffe/go-spiffe/v2 v2.4.0 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
Expand All @@ -123,17 +123,17 @@ require (
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.23.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/term v0.24.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/term v0.25.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/time v0.6.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
google.golang.org/grpc v1.64.1 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 1187227

Please sign in to comment.