diff --git a/Attribution.txt b/Attribution.txt index 0dee22d..72150f8 100644 --- a/Attribution.txt +++ b/Attribution.txt @@ -265,4 +265,10 @@ golang.org/x/exp (BSD-3) https://cs.opensource.google/go/x/exp https://cs.opensource.google/go/x/exp/+/master:LICENSE golang.org/x/time (BSD-3) https://cs.opensource.google/go/x/time -https://cs.opensource.google/go/x/time/+/master:LICENSE \ No newline at end of file +https://cs.opensource.google/go/x/time/+/master:LICENSE + +github.com/go-jose/go-jose/v4 (Apache-2.0) https://github.com/go-jose/go-jose +https://github.com/go-jose/go-jose/blob/main/LICENSE + +google.golang.org/genproto/googleapis/rpc (Apache-2.0) https://github.com/googleapis/go-genproto +https://github.com/googleapis/go-genproto/blob/main/LICENSE diff --git a/Dockerfile b/Dockerfile index 67a6fde..d7bc491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ # # Copyright (C) 2023 YIQISOFT +# Copyright (c) 2024 IOTech Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +15,7 @@ # limitations under the License. # -ARG BASE=golang:1.21-alpine3.18 +ARG BASE=golang:1.23-alpine3.20 FROM ${BASE} AS builder ARG MAKE=make build @@ -33,7 +34,7 @@ COPY . . RUN ${MAKE} # Next image - Copy built Go binary into new workspace -FROM alpine:3.18 +FROM alpine:3.20 LABEL license='SPDX-License-Identifier: Apache-2.0' \ copyright='Copyright (c) 2023: YIQISOFT' diff --git a/Makefile b/Makefile index 0ae0871..0d55c6a 100644 --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ lint: @if [ "z${ARCH}" = "zx86_64" ] && which golangci-lint >/dev/null ; then golangci-lint run --config .golangci.yml ; else echo "WARNING: Linting skipped (not on x86_64 or linter not installed)"; fi install-lint: - sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.54.2 + sudo curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.61.0 test: unittest lint go vet ./... diff --git a/go.mod b/go.mod index e2e2f9e..4432738 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/edgexfoundry/device-s7 -go 1.21 +go 1.23 require ( github.com/edgexfoundry/device-sdk-go/v3 v3.1.1