Skip to content

*: bump jwt (#12343) #12348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ti-chi-bot wants to merge 1 commit into
base: release-8.1
Choose a base branch
from
Open

*: bump jwt (#12343) #12348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 cmd/oauth2-server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/go-oauth2/oauth2/v4/models"
"github.com/go-oauth2/oauth2/v4/server"
"github.com/go-oauth2/oauth2/v4/store"
"github.com/golang-jwt/jwt"
"github.com/golang-jwt/jwt/v5"
"github.com/pingcap/log"
"github.com/spf13/cobra"
"go.uber.org/zap"
Expand Down
44 changes: 44 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,19 @@ require (
github.com/IBM/sarama v1.41.2
github.com/KimMachineGun/automemlimit v0.2.4
github.com/VividCortex/mysqlerr v1.0.0
<<<<<<< HEAD
github.com/apache/pulsar-client-go v0.11.0
github.com/aws/aws-sdk-go v1.50.0
github.com/aws/aws-sdk-go-v2 v1.19.1
github.com/aws/aws-sdk-go-v2/config v1.18.30
github.com/aws/aws-sdk-go-v2/credentials v1.13.29
=======
github.com/apache/pulsar-client-go v0.13.0
github.com/aws/aws-sdk-go v1.55.5
github.com/aws/aws-sdk-go-v2 v1.38.1
github.com/aws/aws-sdk-go-v2/config v1.27.37
github.com/aws/aws-sdk-go-v2/credentials v1.17.35
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))
Comment on lines +12 to +24
Copy link

@gemini-code-assist gemini-code-assist bot Sep 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

This file contains unresolved merge conflict markers (<<<<<<<, =======, >>>>>>>). This is a critical issue that will cause Go tooling to fail and break the build. Please resolve these conflicts by choosing the correct dependency versions, remove the conflict markers, and then run go mod tidy to clean up the go.mod and go.sum files.

github.com/benbjohnson/clock v1.3.5
github.com/bradleyjkemp/grpc-tools v0.2.5
github.com/cenkalti/backoff/v4 v4.2.1
Expand All @@ -31,13 +39,19 @@ require (
github.com/gin-gonic/gin v1.9.1
github.com/glebarez/go-sqlite v1.21.2
github.com/glebarez/sqlite v1.7.0
<<<<<<< HEAD
github.com/go-mysql-org/go-mysql v1.7.1-0.20240507075657-2bd4573edde2
github.com/go-oauth2/oauth2/v4 v4.5.2
=======
github.com/go-mysql-org/go-mysql v1.12.0
github.com/go-oauth2/oauth2/v4 v4.5.4
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))
github.com/go-ozzo/ozzo-validation/v4 v4.3.0
github.com/go-sql-driver/mysql v1.7.1
github.com/goccy/go-json v0.10.2
github.com/gogo/gateway v1.1.0
github.com/gogo/protobuf v1.3.2
github.com/golang-jwt/jwt/v5 v5.3.0
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.4
github.com/google/btree v1.1.2
Expand Down Expand Up @@ -155,10 +169,17 @@ require (
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-resty/resty/v2 v2.11.0 // indirect
<<<<<<< HEAD
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
=======
github.com/goccy/go-reflect v1.2.0 // indirect
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
github.com/google/flatbuffers v2.0.8+incompatible // indirect
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/s2a-go v0.1.7 // indirect
github.com/hamba/avro/v2 v2.22.2-0.20240625062549-66aad10411d9 // indirect
github.com/influxdata/tdigest v0.0.1 // indirect
github.com/jellydator/ttlcache/v3 v3.0.1 // indirect
github.com/jfcg/sixb v1.3.8 // indirect
Expand All @@ -167,7 +188,21 @@ require (
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
github.com/ks3sdklib/aws-sdk-go v1.2.9 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
<<<<<<< HEAD
github.com/otiai10/copy v1.2.0 // indirect
=======
github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pingcap/metering_sdk v0.0.0-20250918015914-468cd6feb1dc // indirect
github.com/qri-io/jsonpointer v0.1.1 // indirect
github.com/qri-io/jsonschema v0.2.1 // indirect
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
Expand Down Expand Up @@ -239,8 +274,13 @@ require (
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
<<<<<<< HEAD
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
=======
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))
github.com/eapache/go-resiliency v1.4.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
github.com/eapache/queue v1.1.0 // indirect
Expand All @@ -257,8 +297,12 @@ require (
github.com/go-playground/validator/v10 v10.14.0 // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/godbus/dbus/v5 v5.0.4 // indirect
<<<<<<< HEAD
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/golang/glog v1.2.0 // indirect
=======
github.com/golang/glog v1.2.4 // indirect
>>>>>>> 4b7fe4b517 (*: bump jwt (#12343))
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/pprof v0.0.0-20240117000934-35fc243c5815 // indirect
Expand Down
Loading
Loading