Skip to content

Commit

Permalink
Update sarama to fix Kerberos authentication for Kafka (elastic#18711) (
Browse files Browse the repository at this point in the history
elastic#18809)

(cherry picked from commit fa1bd86)
  • Loading branch information
kvch committed May 28, 2020
1 parent 29fd07a commit 59a0737
Show file tree
Hide file tree
Showing 156 changed files with 4,583 additions and 915 deletions.
20 changes: 10 additions & 10 deletions NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,7 @@ SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/eapache/go-resiliency
Version: v1.1.0
Version: v1.2.0
License type (autodetected): MIT
./vendor/github.com/eapache/go-resiliency/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -3159,7 +3159,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: github.com/hashicorp/go-uuid
Version: v1.0.1
Version: v1.0.2
License type (autodetected): MPL-2.0
./vendor/github.com/hashicorp/go-uuid/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -4595,8 +4595,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/klauspost/compress
Version: v1.9.3
Revision: c099ac9f21dd
Version: v1.9.8
License type (autodetected): BSD-3-Clause
./vendor/github.com/klauspost/compress/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -5570,7 +5569,7 @@ See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.

--------------------------------------------------------------------
Dependency: github.com/pierrec/lz4
Version: v2.2.6
Version: v2.4.1
License type (autodetected): BSD-3-Clause
./vendor/github.com/pierrec/lz4/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -5861,7 +5860,7 @@ See https://github.com/samuel/go-zookeeper/blob/master/LICENSE for license detai

--------------------------------------------------------------------
Dependency: github.com/rcrowley/go-metrics
Revision: 3113b8401b8a
Revision: cac0b30c2563
License type (autodetected): BSD-2-Clause
./vendor/github.com/rcrowley/go-metrics/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -6158,7 +6157,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------
Dependency: github.com/Shopify/sarama
Overwrite: github.com/elastic/sarama
Overwrite-Revision: 355d120d0970
Overwrite-Version: v1.24.1
Overwrite-Revision: cbc80333a91e
License type (autodetected): MIT
./vendor/github.com/Shopify/sarama/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -7117,7 +7117,7 @@ Apache License 2.0

--------------------------------------------------------------------
Dependency: gopkg.in/jcmturner/gokrb5.v7
Version: v7.3.0
Version: v7.5.0
License type (autodetected): Apache-2.0
./vendor/gopkg.in/jcmturner/gokrb5.v7/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -7232,7 +7232,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: gopkg.in/yaml.v2
Version: v2.2.7
Version: v2.2.8
License type (autodetected): Apache-2.0
./vendor/gopkg.in/yaml.v2/LICENSE:
--------------------------------------------------------------------
Expand All @@ -7255,7 +7255,7 @@ limitations under the License.

--------------------------------------------------------------------
Dependency: gopkg.in/yaml.v2
Version: v2.2.7
Version: v2.2.8
License type (autodetected): MIT
./vendor/gopkg.in/yaml.v2/LICENSE.libyaml:
--------------------------------------------------------------------
Expand Down
9 changes: 3 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,11 @@ require (
github.com/grpc-ecosystem/grpc-gateway v1.13.0 // indirect
github.com/hashicorp/golang-lru v0.5.2-0.20190520140433-59383c442f7d // indirect
github.com/insomniacslk/dhcp v0.0.0-20180716145214-633285ba52b2
github.com/jcmturner/gofork v1.0.0 // indirect
github.com/jmoiron/sqlx v1.2.1-0.20190826204134-d7d95172beb5
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901
github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca
github.com/jpillora/backoff v1.0.0 // indirect
github.com/jstemmer/go-junit-report v0.9.1
github.com/klauspost/compress v1.9.3-0.20191122130757-c099ac9f21dd // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/lib/pq v1.1.2-0.20190507191818-2ff3cb3adc01
github.com/magefile/mage v1.9.0
Expand All @@ -122,7 +120,7 @@ require (
github.com/prometheus/common v0.7.0
github.com/prometheus/procfs v0.0.9-0.20191208103036-42f6e295b56f
github.com/prometheus/prometheus v2.5.0+incompatible
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a
github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563
github.com/reviewdog/reviewdog v0.9.17
github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e // indirect
github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54
Expand Down Expand Up @@ -152,9 +150,8 @@ require (
google.golang.org/api v0.15.0
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb
gopkg.in/inf.v0 v0.9.0
gopkg.in/jcmturner/gokrb5.v7 v7.3.0 // indirect
gopkg.in/mgo.v2 v2.0.0-20160818020120-3f83fa500528
gopkg.in/yaml.v2 v2.2.7
gopkg.in/yaml.v2 v2.2.8
howett.net/plist v0.0.0-20181124034731-591f970eefbb
k8s.io/api v0.0.0-20190722141453-b90922c02518
k8s.io/apimachinery v0.0.0-20190719140911-bfcf53abc9f8
Expand All @@ -166,7 +163,7 @@ require (

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v12.2.0+incompatible
github.com/Shopify/sarama => github.com/elastic/sarama v0.0.0-20191122160421-355d120d0970
github.com/Shopify/sarama => github.com/elastic/sarama v1.24.1-elastic.0.20200519143807-cbc80333a91e
github.com/docker/docker => github.com/docker/engine v0.0.0-20191113042239-ea84732a7725
github.com/docker/go-plugins-helpers => github.com/elastic/go-plugins-helpers v0.0.0-20200207104224-bdf17607b79f
github.com/dop251/goja => github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20
Expand Down
Loading

0 comments on commit 59a0737

Please sign in to comment.