From e52ed72715ca3f448b17bf78b1b60d4b2551565c Mon Sep 17 00:00:00 2001 From: Robert Yokota Date: Thu, 1 Aug 2024 10:32:54 -0700 Subject: [PATCH] Bump version to 2.5.1 (except librdkafka.redist) (#2273) --- .semaphore/semaphore.yml | 4 ++-- CHANGELOG.md | 9 +++++++++ README.md | 4 ++-- examples/AdminClient/AdminClient.csproj | 2 +- examples/AvroBlogExamples/AvroBlogExamples.csproj | 2 +- examples/AvroGeneric/AvroGeneric.csproj | 2 +- .../AvroGenericEncryption/AvroGenericEncryption.csproj | 2 +- .../AvroGenericMigration/AvroGenericMigration.csproj | 2 +- examples/AvroSpecific/AvroSpecific.csproj | 2 +- .../AvroSpecificEncryption/AvroSpecificEncryption.csproj | 2 +- examples/Configuration/Configuration.csproj | 2 +- examples/ConfluentCloud/ConfluentCloud.csproj | 2 +- examples/Consumer/Consumer.csproj | 2 +- examples/ExactlyOnce/ExactlyOnce.csproj | 2 +- .../ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj | 2 +- .../JsonEncryption/JsonSerializationEncryption.csproj | 2 +- examples/JsonSerialization/JsonSerialization.csproj | 2 +- examples/JsonWithReferences/JsonWithReferences.csproj | 2 +- examples/MultiProducer/MultiProducer.csproj | 2 +- examples/OAuthConsumer/OAuthConsumer.csproj | 2 +- examples/OAuthOIDC/OAuthOIDC.csproj | 2 +- examples/OAuthProducer/OAuthProducer.csproj | 2 +- examples/Producer/Producer.csproj | 2 +- examples/Protobuf/Protobuf.csproj | 2 +- examples/ProtobufEncryption/ProtobufEncryption.csproj | 2 +- examples/TlsAuth/TlsAuth.csproj | 2 +- examples/Web/Web.csproj | 2 +- src/Confluent.Kafka/Confluent.Kafka.csproj | 2 +- .../Confluent.SchemaRegistry.Encryption.Aws.csproj | 2 +- .../Confluent.SchemaRegistry.Encryption.Azure.csproj | 2 +- .../Confluent.SchemaRegistry.Encryption.Gcp.csproj | 2 +- .../Confluent.SchemaRegistry.Encryption.HcVault.csproj | 2 +- .../Confluent.SchemaRegistry.Encryption.csproj | 2 +- .../Confluent.SchemaRegistry.Rules.csproj | 2 +- .../Confluent.SchemaRegistry.Serdes.Avro.csproj | 2 +- .../Confluent.SchemaRegistry.Serdes.Json.csproj | 2 +- .../Confluent.SchemaRegistry.Serdes.Protobuf.csproj | 2 +- .../Confluent.SchemaRegistry.csproj | 2 +- 38 files changed, 48 insertions(+), 39 deletions(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 9f4224e38..82f641698 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -129,7 +129,7 @@ blocks: type: s1-prod-ubuntu20-04-amd64-2 prologue: commands: - - docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY + - '[[ -z $DOCKERHUB_APIKEY ]] || docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY' jobs: - name: 'Build and test with "classic" protocol' commands: @@ -154,7 +154,7 @@ blocks: type: s1-prod-ubuntu20-04-amd64-2 prologue: commands: - - docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY + - '[[ -z $DOCKERHUB_APIKEY ]] || docker login --username $DOCKERHUB_USER --password $DOCKERHUB_APIKEY' jobs: - name: 'Build and test' commands: diff --git a/CHANGELOG.md b/CHANGELOG.md index a33bfd94e..b8eb65955 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 2.5.1 + +## Fixes + +- Fix CSFLE (client-side field-level encryption) when using Azure Key Vault by specifying RsaOaep256 (instead of RsaOaep) for interoperability with clients in other languages (Java, go, etc.). +- Fix AvroSerializer configuration to allow using schema normalization. +- Upgrade Azure Identity library to 1.11.4 to address a vulnerability in previous versions. + + # 2.5.0 ## Enhancements diff --git a/README.md b/README.md index 48e320c62..8658f9fca 100644 --- a/README.md +++ b/README.md @@ -49,13 +49,13 @@ confluent-kafka-dotnet is distributed via NuGet. We provide the following packa To install Confluent.Kafka from within Visual Studio, search for Confluent.Kafka in the NuGet Package Manager UI, or run the following command in the Package Manager Console: ``` -Install-Package Confluent.Kafka -Version 2.5.0 +Install-Package Confluent.Kafka -Version 2.5.1 ``` To add a reference to a dotnet core project, execute the following at the command line: ``` -dotnet add package -v 2.5.0 Confluent.Kafka +dotnet add package -v 2.5.1 Confluent.Kafka ``` Note: `Confluent.Kafka` depends on the `librdkafka.redist` package which provides a number of different builds of `librdkafka` that are compatible with [common platforms](https://github.com/edenhill/librdkafka/wiki/librdkafka.redist-NuGet-package-runtime-libraries). If you are on one of these platforms this will all work seamlessly (and you don't need to explicitly reference `librdkafka.redist`). If you are on a different platform, you may need to [build librdkafka](https://github.com/edenhill/librdkafka#building) manually (or acquire it via other means) and load it using the [Library.Load](https://docs.confluent.io/current/clients/confluent-kafka-dotnet/api/Confluent.Kafka.Library.html#Confluent_Kafka_Library_Load_System_String_) method. diff --git a/examples/AdminClient/AdminClient.csproj b/examples/AdminClient/AdminClient.csproj index ae3733461..c8a20b778 100755 --- a/examples/AdminClient/AdminClient.csproj +++ b/examples/AdminClient/AdminClient.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/AvroBlogExamples/AvroBlogExamples.csproj b/examples/AvroBlogExamples/AvroBlogExamples.csproj index 1f4914dbf..fae1c4fb8 100644 --- a/examples/AvroBlogExamples/AvroBlogExamples.csproj +++ b/examples/AvroBlogExamples/AvroBlogExamples.csproj @@ -8,7 +8,7 @@ - + diff --git a/examples/AvroGeneric/AvroGeneric.csproj b/examples/AvroGeneric/AvroGeneric.csproj index 26deb7239..d9c95f1bc 100644 --- a/examples/AvroGeneric/AvroGeneric.csproj +++ b/examples/AvroGeneric/AvroGeneric.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj index b018e4dc9..a8c68a47e 100644 --- a/examples/AvroGenericEncryption/AvroGenericEncryption.csproj +++ b/examples/AvroGenericEncryption/AvroGenericEncryption.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/AvroGenericMigration/AvroGenericMigration.csproj b/examples/AvroGenericMigration/AvroGenericMigration.csproj index ea5d13796..c023c3c81 100644 --- a/examples/AvroGenericMigration/AvroGenericMigration.csproj +++ b/examples/AvroGenericMigration/AvroGenericMigration.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/AvroSpecific/AvroSpecific.csproj b/examples/AvroSpecific/AvroSpecific.csproj index 354c68d7a..9ba1dce10 100644 --- a/examples/AvroSpecific/AvroSpecific.csproj +++ b/examples/AvroSpecific/AvroSpecific.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj index 4c26be01d..e6861125a 100644 --- a/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj +++ b/examples/AvroSpecificEncryption/AvroSpecificEncryption.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/Configuration/Configuration.csproj b/examples/Configuration/Configuration.csproj index fd9c9827b..6424cbcd8 100644 --- a/examples/Configuration/Configuration.csproj +++ b/examples/Configuration/Configuration.csproj @@ -8,7 +8,7 @@ - + diff --git a/examples/ConfluentCloud/ConfluentCloud.csproj b/examples/ConfluentCloud/ConfluentCloud.csproj index afa125d29..6f8837210 100644 --- a/examples/ConfluentCloud/ConfluentCloud.csproj +++ b/examples/ConfluentCloud/ConfluentCloud.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/Consumer/Consumer.csproj b/examples/Consumer/Consumer.csproj index 879f5a5e6..4538c9116 100755 --- a/examples/Consumer/Consumer.csproj +++ b/examples/Consumer/Consumer.csproj @@ -8,7 +8,7 @@ - + diff --git a/examples/ExactlyOnce/ExactlyOnce.csproj b/examples/ExactlyOnce/ExactlyOnce.csproj index 13c42f7c9..e3699d5f8 100644 --- a/examples/ExactlyOnce/ExactlyOnce.csproj +++ b/examples/ExactlyOnce/ExactlyOnce.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj index a1df99160..872bb397f 100644 --- a/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj +++ b/examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/JsonEncryption/JsonSerializationEncryption.csproj b/examples/JsonEncryption/JsonSerializationEncryption.csproj index 4dc610b9c..38f2f0d38 100644 --- a/examples/JsonEncryption/JsonSerializationEncryption.csproj +++ b/examples/JsonEncryption/JsonSerializationEncryption.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/JsonSerialization/JsonSerialization.csproj b/examples/JsonSerialization/JsonSerialization.csproj index b6cb9a61c..df9600bb3 100644 --- a/examples/JsonSerialization/JsonSerialization.csproj +++ b/examples/JsonSerialization/JsonSerialization.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/JsonWithReferences/JsonWithReferences.csproj b/examples/JsonWithReferences/JsonWithReferences.csproj index 59004d691..6affebec6 100644 --- a/examples/JsonWithReferences/JsonWithReferences.csproj +++ b/examples/JsonWithReferences/JsonWithReferences.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/MultiProducer/MultiProducer.csproj b/examples/MultiProducer/MultiProducer.csproj index 4d293ebfe..4f2d492a0 100644 --- a/examples/MultiProducer/MultiProducer.csproj +++ b/examples/MultiProducer/MultiProducer.csproj @@ -8,7 +8,7 @@ - + diff --git a/examples/OAuthConsumer/OAuthConsumer.csproj b/examples/OAuthConsumer/OAuthConsumer.csproj index 066670c61..72f8d9944 100644 --- a/examples/OAuthConsumer/OAuthConsumer.csproj +++ b/examples/OAuthConsumer/OAuthConsumer.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/OAuthOIDC/OAuthOIDC.csproj b/examples/OAuthOIDC/OAuthOIDC.csproj index c3e466fe9..006af21b5 100644 --- a/examples/OAuthOIDC/OAuthOIDC.csproj +++ b/examples/OAuthOIDC/OAuthOIDC.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/OAuthProducer/OAuthProducer.csproj b/examples/OAuthProducer/OAuthProducer.csproj index 4921cf949..d853dd004 100644 --- a/examples/OAuthProducer/OAuthProducer.csproj +++ b/examples/OAuthProducer/OAuthProducer.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/Producer/Producer.csproj b/examples/Producer/Producer.csproj index b1d0aa813..a838e3991 100755 --- a/examples/Producer/Producer.csproj +++ b/examples/Producer/Producer.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/Protobuf/Protobuf.csproj b/examples/Protobuf/Protobuf.csproj index 18dd528e8..cddb729af 100644 --- a/examples/Protobuf/Protobuf.csproj +++ b/examples/Protobuf/Protobuf.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/ProtobufEncryption/ProtobufEncryption.csproj b/examples/ProtobufEncryption/ProtobufEncryption.csproj index e627bfc1e..231b68f44 100644 --- a/examples/ProtobufEncryption/ProtobufEncryption.csproj +++ b/examples/ProtobufEncryption/ProtobufEncryption.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/TlsAuth/TlsAuth.csproj b/examples/TlsAuth/TlsAuth.csproj index 13b2e938b..5ff6e38b2 100644 --- a/examples/TlsAuth/TlsAuth.csproj +++ b/examples/TlsAuth/TlsAuth.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/Web/Web.csproj b/examples/Web/Web.csproj index 6579ca402..4f873736f 100644 --- a/examples/Web/Web.csproj +++ b/examples/Web/Web.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/Confluent.Kafka/Confluent.Kafka.csproj b/src/Confluent.Kafka/Confluent.Kafka.csproj index de4163cd1..45b3ed407 100644 --- a/src/Confluent.Kafka/Confluent.Kafka.csproj +++ b/src/Confluent.Kafka/Confluent.Kafka.csproj @@ -16,7 +16,7 @@ README.md Confluent.Kafka Confluent.Kafka - 2.5.0 + 2.5.1 netstandard2.0;netstandard1.3;net462;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj b/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj index b24554259..79eac6f66 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Aws/Confluent.SchemaRegistry.Encryption.Aws.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Encryption.Aws Confluent.SchemaRegistry.Encryption.Aws Confluent.SchemaRegistry.Encryption.Aws - 2.5.0 + 2.5.1 netcoreapp3.1;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj b/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj index b76e0e26c..4fcc606cc 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Azure/Confluent.SchemaRegistry.Encryption.Azure.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Encryption.Azure Confluent.SchemaRegistry.Encryption.Azure Confluent.SchemaRegistry.Encryption.Azure - 2.5.0 + 2.5.1 netcoreapp3.1;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj b/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj index 11ceb3617..372726c5b 100644 --- a/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.Gcp/Confluent.SchemaRegistry.Encryption.Gcp.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Encryption.Gcp Confluent.SchemaRegistry.Encryption.Gcp Confluent.SchemaRegistry.Encryption.Gcp - 2.5.0 + 2.5.1 netcoreapp3.1;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj b/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj index 09dcfa72b..fa615e7d0 100644 --- a/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj +++ b/src/Confluent.SchemaRegistry.Encryption.HcVault/Confluent.SchemaRegistry.Encryption.HcVault.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Encryption.HcVault Confluent.SchemaRegistry.Encryption.HcVault Confluent.SchemaRegistry.Encryption.HcVault - 2.5.0 + 2.5.1 netcoreapp3.1;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj index 6fb26ea8d..f8771ece2 100644 --- a/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj +++ b/src/Confluent.SchemaRegistry.Encryption/Confluent.SchemaRegistry.Encryption.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Encryption Confluent.SchemaRegistry.Encryption Confluent.SchemaRegistry.Encryption - 2.5.0 + 2.5.1 netcoreapp3.1;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj index d5c198256..ecff9c1ab 100644 --- a/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj +++ b/src/Confluent.SchemaRegistry.Rules/Confluent.SchemaRegistry.Rules.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Rules Confluent.SchemaRegistry.Rules Confluent.SchemaRegistry.Rules - 2.5.0 + 2.5.1 net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj b/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj index 8b0d59035..d7e6fdb4a 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Serdes.Avro Confluent.SchemaRegistry.Serdes.Avro Confluent.SchemaRegistry.Serdes.Avro - 2.5.0 + 2.5.1 netstandard2.0;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj index a2202a271..45dfac82c 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj @@ -15,7 +15,7 @@ Confluent.SchemaRegistry.Serdes.Json Confluent.SchemaRegistry.Serdes.Json Confluent.SchemaRegistry.Serdes.Json - 2.5.0 + 2.5.1 netstandard2.0;net6.0 true true diff --git a/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj b/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj index cc54e7bc9..3031e1a35 100644 --- a/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj +++ b/src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj @@ -16,7 +16,7 @@ Confluent.SchemaRegistry.Serdes.Protobuf Confluent.SchemaRegistry.Serdes.Protobuf Confluent.SchemaRegistry.Serdes.Protobuf - 2.5.0 + 2.5.1 netstandard2.0;net6.0 true true diff --git a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj index 224d4d654..e5d9c0377 100644 --- a/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj +++ b/src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj @@ -16,7 +16,7 @@ Confluent.SchemaRegistry Confluent.SchemaRegistry Confluent.SchemaRegistry - 2.5.0 + 2.5.1 netstandard2.0;net6.0 true true