Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
go-version: [1.22.x]
go-version: [1.24.x]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.22.7
go-version: 1.24.6
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/cross-compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function _build() {

# go build -trimpath to build the binary.
if [ "${CAN_BUILD_WITHOUT_DOCKER}" == "false" ]; then
docker run --name runner -d -v $PWD:$PWD --workdir $PWD golang:1.22 sleep infinity
docker run --name runner -d -v $PWD:$PWD --workdir $PWD golang:1.24.6 sleep infinity
docker exec -t runner git config --global --add safe.directory $PWD
docker exec -t runner go build -trimpath -tags kqueue --ldflags "${LDFLAGS}" -o "./bin/minio_${os}_${arch}" 1>/dev/null
MUID=$(id -u)
Expand Down
2 changes: 1 addition & 1 deletion cmd/config-encrypted.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/minio/minio/cmd/logger"
"github.com/minio/minio/pkg/auth"
"github.com/minio/minio/pkg/madmin"
etcd "go.etcd.io/etcd/clientv3"
etcd "go.etcd.io/etcd/client/v3"
)

func handleEncryptedConfigBackend(objAPI ObjectLayer) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/dns/etcd_dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"github.com/coredns/coredns/plugin/etcd/msg"
"github.com/minio/minio-go/v7/pkg/set"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/client/v3"
)

// ErrNoEntriesFound - Indicates no entries were found for the given key (directory)
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/dns/operator_dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"strings"
"time"

"github.com/dgrijalva/jwt-go"
"github.com/golang-jwt/jwt/v4"
"github.com/minio/minio/cmd/config"
xhttp "github.com/minio/minio/cmd/http"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/config/etcd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"github.com/minio/minio/cmd/config"
"github.com/minio/minio/pkg/env"
xnet "github.com/minio/minio/pkg/net"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/namespace"
"go.etcd.io/etcd/client/v3"
"go.etcd.io/etcd/client/v3/namespace"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/config/identity/openid/ecdsa-sha3.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package openid
import (
"crypto"

"github.com/dgrijalva/jwt-go"
"github.com/golang-jwt/jwt/v4"

// Needed for SHA3 to work - See: https://golang.org/src/crypto/crypto.go?s=1034:1288
_ "golang.org/x/crypto/sha3" // There is no SHA-3 FIPS-140 2 compliant implementation
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/identity/openid/jwt.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"sync"
"time"

jwtgo "github.com/dgrijalva/jwt-go"
jwtgo "github.com/golang-jwt/jwt/v4"
"github.com/minio/minio/cmd/config"
"github.com/minio/minio/pkg/auth"
"github.com/minio/minio/pkg/env"
Expand Down
2 changes: 1 addition & 1 deletion cmd/config/identity/openid/rsa-sha3.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package openid
import (
"crypto"

"github.com/dgrijalva/jwt-go"
"github.com/golang-jwt/jwt/v4"

// Needed for SHA3 to work - See: https://golang.org/src/crypto/crypto.go?s=1034:1288
_ "golang.org/x/crypto/sha3" // There is no SHA-3 FIPS-140 2 compliant implementation
Expand Down
2 changes: 1 addition & 1 deletion cmd/etcd.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"errors"
"fmt"

etcd "go.etcd.io/etcd/clientv3"
etcd "go.etcd.io/etcd/client/v3"
)

var errEtcdUnreachable = errors.New("etcd is unreachable, please check your endpoints")
Expand Down
2 changes: 1 addition & 1 deletion cmd/globals.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"github.com/minio/minio/cmd/config/storageclass"
xhttp "github.com/minio/minio/cmd/http"
"github.com/minio/minio/pkg/auth"
etcd "go.etcd.io/etcd/clientv3"
etcd "go.etcd.io/etcd/client/v3"

"github.com/minio/minio/pkg/certs"
"github.com/minio/minio/pkg/event"
Expand Down
6 changes: 3 additions & 3 deletions cmd/iam-etcd-store.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ import (
"time"
"unicode/utf8"

jwtgo "github.com/dgrijalva/jwt-go"
jwtgo "github.com/golang-jwt/jwt/v4"
"github.com/minio/minio-go/v7/pkg/set"
"github.com/minio/minio/cmd/logger"
"github.com/minio/minio/pkg/auth"
iampolicy "github.com/minio/minio/pkg/iam/policy"
"github.com/minio/minio/pkg/madmin"
etcd "go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/api/v3/mvccpb"
etcd "go.etcd.io/etcd/client/v3"
)

var defaultContextTimeout = 30 * time.Second
Expand Down
2 changes: 1 addition & 1 deletion cmd/iam-object-store.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"time"
"unicode/utf8"

jwtgo "github.com/dgrijalva/jwt-go"
jwtgo "github.com/golang-jwt/jwt/v4"

"github.com/minio/minio/cmd/logger"
"github.com/minio/minio/pkg/auth"
Expand Down
4 changes: 2 additions & 2 deletions cmd/jwt.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"net/http"
"time"

jwtgo "github.com/dgrijalva/jwt-go"
jwtreq "github.com/dgrijalva/jwt-go/request"
jwtgo "github.com/golang-jwt/jwt/v4"
jwtreq "github.com/golang-jwt/jwt/v4/request"
xjwt "github.com/minio/minio/cmd/jwt"
"github.com/minio/minio/cmd/logger"
"github.com/minio/minio/pkg/auth"
Expand Down
2 changes: 1 addition & 1 deletion cmd/jwt/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"sync"
"time"

jwtgo "github.com/dgrijalva/jwt-go"
jwtgo "github.com/golang-jwt/jwt/v4"
jsoniter "github.com/json-iterator/go"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/jwt/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"testing"
"time"

"github.com/dgrijalva/jwt-go"
"github.com/golang-jwt/jwt/v4"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cmd/storage-rest-server.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (

"github.com/tinylib/msgp/msgp"

jwtreq "github.com/dgrijalva/jwt-go/request"
jwtreq "github.com/golang-jwt/jwt/v4/request"
"github.com/gorilla/mux"
"github.com/minio/minio/cmd/config"
xhttp "github.com/minio/minio/cmd/http"
Expand Down
2 changes: 1 addition & 1 deletion cmd/web-handlers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"strings"
"testing"

jwtgo "github.com/dgrijalva/jwt-go"
jwtgo "github.com/golang-jwt/jwt/v4"
humanize "github.com/dustin/go-humanize"
xjwt "github.com/minio/minio/cmd/jwt"
"github.com/minio/minio/pkg/hash"
Expand Down
Loading