From 036f2a0f039646a01f4c9609dbdcc2b4322a9684 Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Mon, 4 Sep 2023 17:45:06 +0800 Subject: [PATCH] kvdb: fix version conflict in `github.com/ulikunitz/xz` Fix the following conflict, ``` go: conflicting replacements for github.com/ulikunitz/xz: github.com/ulikunitz/xz@v0.5.11 github.com/ulikunitz/xz@v0.5.8 ``` --- kvdb/go.mod | 2 +- kvdb/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kvdb/go.mod b/kvdb/go.mod index fbaf9f8dc..7dd7a2c7a 100644 --- a/kvdb/go.mod +++ b/kvdb/go.mod @@ -111,7 +111,7 @@ require ( replace github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt v3.2.1+incompatible // This replace is for https://github.com/advisories/GHSA-25xm-hr59-7c27 -replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.8 +replace github.com/ulikunitz/xz => github.com/ulikunitz/xz v0.5.11 // This replace is for // https://deps.dev/advisory/OSV/GO-2021-0053?from=%2Fgo%2Fgithub.com%252Fgogo%252Fprotobuf%2Fv1.3.1 diff --git a/kvdb/go.sum b/kvdb/go.sum index 274d6e32f..f54ddefdc 100644 --- a/kvdb/go.sum +++ b/kvdb/go.sum @@ -300,8 +300,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ= -github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= +github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo= github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=