Skip to content

Commit

Permalink
-> v1.7.0-RC4 (#1592)
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Howlett authored Apr 22, 2021
1 parent 643c8fd commit 85facb6
Show file tree
Hide file tree
Showing 22 changed files with 53 additions and 25 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# 1.7.0-RC4

## Enhancements

- References librdkafka.redist 1.7.0-RC4. Refer to the [release notes](https://github.com/edenhill/librdkafka/releases/tag/v1.7.0-RC4) for more information.


## Fixes

- Resolved a schema caching bug ([#1587](https://github.com/confluentinc/confluent-kafka-dotnet/pull/1587)) in `CachedSchemaRegistryClient.GetSchemaIdAsync` ([jeremy001181](https://github.com/jeremy001181)).
- Fixed a configuration error in the Web example ([cjgalione](https://github.com/cjgalione)).

## Security

- Updated `System.Net.Http` dependency to v4.3.4 ([CVE-2018-8292](https://github.com/advisories/GHSA-7jgj-8wvc-jh57))


# 1.6.3

## Fixes
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ confluent-kafka-dotnet is distributed via NuGet. We provide five packages:
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 1.6.3
Install-Package Confluent.Kafka -Version 1.7.0-RC4
```

To add a reference to a dotnet core project, execute the following at the command line:

```
dotnet add package -v 1.6.3 Confluent.Kafka
dotnet add package -v 1.7.0-RC4 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.
Expand Down
2 changes: 1 addition & 1 deletion examples/AdminClient/AdminClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/AvroBlogExamples/AvroBlogExamples.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/AvroGeneric/AvroGeneric.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/AvroSpecific/AvroSpecific.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/ConfluentCloud/ConfluentCloud.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Consumer/Consumer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
15 changes: 13 additions & 2 deletions examples/Consumer/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,12 @@ public static void Run_Consume(string brokerList, List<string> topics, Cancellat
{
// Since a cooperative assignor (CooperativeSticky) has been configured, the
// partition assignment is incremental (adds partitions to any existing assignment).
Console.WriteLine($"Incremental partition assignment: [{string.Join(", ", partitions)}]");
Console.WriteLine(
"Partitions incrementally assigned: [" +
string.Join(',', partitions.Select(p => p.Partition.Value)) +
"], all: [" +
string.Join(',', c.Assignment.Concat(partitions).Select(p => p.Partition.Value)) +
"]");

// Possibly manually specify start offsets by returning a list of topic/partition/offsets
// to assign to, e.g.:
Expand All @@ -75,7 +80,13 @@ public static void Run_Consume(string brokerList, List<string> topics, Cancellat
{
// Since a cooperative assignor (CooperativeSticky) has been configured, the revoked
// assignment is incremental (may remove only some partitions of the current assignment).
Console.WriteLine($"Incremental partition revokation: [{string.Join(", ", partitions)}]");
var remaining = c.Assignment.Where(atp => partitions.Where(rtp => rtp.TopicPartition == atp).Count() == 0);
Console.WriteLine(
"Partitions incrementally revoked: [" +
string.Join(',', partitions.Select(p => p.Partition.Value)) +
"], remaining: [" +
string.Join(',', remaining.Select(p => p.Partition.Value)) +
"]");
})
.SetPartitionsLostHandler((c, partitions) =>
{
Expand Down
2 changes: 1 addition & 1 deletion examples/ExactlyOnce/ExactlyOnce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
<PackageReference Include="Microsoft.FASTER.Core" Version="1.8.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/ExactlyOnceOldBroker/ExactlyOnceOldBroker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
<PackageReference Include="RocksDbSharp" Version="6.2.2" />
<PackageReference Include="RocksDbNative" Version="6.2.2" />
Expand Down
2 changes: 1 addition & 1 deletion examples/JsonSerialization/JsonSerialization.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Json" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Json" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Json/Confluent.SchemaRegistry.Serdes.Json.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/MultiProducer/MultiProducer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Producer/Producer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Protobuf/Protobuf.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Protobuf" Version="1.6.3" /> -->
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Protobuf" Version="1.7.0-RC4" /> -->
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Protobuf/Confluent.SchemaRegistry.Serdes.Protobuf.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion examples/Web/Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Confluent.Kafka" Version="1.6.3" />
<PackageReference Include="Confluent.Kafka" Version="1.7.0-RC4" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/ConfigGen/ConfigGen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Net.Http" Version="4.3.3" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/Confluent.Kafka/Confluent.Kafka.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageId>Confluent.Kafka</PackageId>
<Title>Confluent.Kafka</Title>
<AssemblyName>Confluent.Kafka</AssemblyName>
<VersionPrefix>1.6.3</VersionPrefix>
<VersionPrefix>1.7.0-RC4</VersionPrefix>
<TargetFrameworks>net45;net46;netcoreapp2.1;netstandard1.3;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -21,7 +21,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="librdkafka.redist" Version="1.6.1">
<PackageReference Include="librdkafka.redist" Version="1.7.0-RC4">
<PrivateAssets Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">None</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Memory" Version="4.5.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry.Serdes.Avro</PackageId>
<Title>Confluent.SchemaRegistry.Serdes.Avro</Title>
<AssemblyName>Confluent.SchemaRegistry.Serdes.Avro</AssemblyName>
<VersionPrefix>1.6.3</VersionPrefix>
<VersionPrefix>1.7.0-RC4</VersionPrefix>
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry.Serdes.Json</PackageId>
<Title>Confluent.SchemaRegistry.Serdes.Json</Title>
<AssemblyName>Confluent.SchemaRegistry.Serdes.Json</AssemblyName>
<VersionPrefix>1.6.3</VersionPrefix>
<VersionPrefix>1.7.0-RC4</VersionPrefix>
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry.Serdes.Protobuf</PackageId>
<Title>Confluent.SchemaRegistry.Serdes.Protobuf</Title>
<AssemblyName>Confluent.SchemaRegistry.Serdes.Protobuf</AssemblyName>
<VersionPrefix>1.6.3</VersionPrefix>
<VersionPrefix>1.7.0-RC4</VersionPrefix>
<TargetFrameworks>netstandard2.0;</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down
4 changes: 2 additions & 2 deletions src/Confluent.SchemaRegistry/Confluent.SchemaRegistry.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageId>Confluent.SchemaRegistry</PackageId>
<Title>Confluent.SchemaRegistry</Title>
<AssemblyName>Confluent.SchemaRegistry</AssemblyName>
<VersionPrefix>1.6.3</VersionPrefix>
<VersionPrefix>1.7.0-RC4</VersionPrefix>
<TargetFrameworks>netstandard1.4;netstandard2.0</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand All @@ -27,7 +27,7 @@

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="System.Net.Http" Version="4.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
</ItemGroup>

</Project>

0 comments on commit 85facb6

Please sign in to comment.