Skip to content

Commit 2446dff

Browse files
committed
Merge branch '1.7.x'
2 parents 32ea3b6 + 9059000 commit 2446dff

File tree

25 files changed

+121
-36
lines changed

25 files changed

+121
-36
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,22 @@
1+
# 1.7.0
2+
3+
## Enhancements
4+
5+
- References librdkafka.redist 1.7.0. Refer to the [librdkafka release notes](https://github.com/edenhill/librdkafka/releases/tag/v1.7.0) for a complete
6+
list of changes, enhancements, fixes and upgrade considerations.
7+
- Added OAuth support to AdminClient ([jerive](https://github.com/jerive))
8+
9+
10+
## Fixes
11+
12+
- Resolved a schema caching bug ([#1587](https://github.com/confluentinc/confluent-kafka-dotnet/pull/1587)) in `CachedSchemaRegistryClient.GetSchemaIdAsync` ([jeremy001181](https://github.com/jeremy001181)).
13+
- Fixed a configuration error in the Web example ([cjgalione](https://github.com/cjgalione)).
14+
15+
## Security
16+
17+
- Updated `System.Net.Http` dependency to v4.3.4 ([CVE-2018-8292](https://github.com/advisories/GHSA-7jgj-8wvc-jh57))
18+
19+
120
# 1.6.3
221

322
## Fixes

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ confluent-kafka-dotnet is distributed via NuGet. We provide five packages:
4444
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:
4545

4646
```
47-
Install-Package Confluent.Kafka -Version 1.6.3
47+
Install-Package Confluent.Kafka -Version 1.7.0
4848
```
4949

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

5252
```
53-
dotnet add package -v 1.6.3 Confluent.Kafka
53+
dotnet add package -v 1.7.0 Confluent.Kafka
5454
```
5555

5656
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.

examples/AdminClient/AdminClient.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0" /> -->
1313
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1414
</ItemGroup>
1515

examples/AvroBlogExamples/AvroBlogExamples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.6.3" /> -->
11+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.7.0" /> -->
1212
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
1313
</ItemGroup>
1414

examples/AvroGeneric/AvroGeneric.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.6.3" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.7.0" /> -->
1313
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
1414
</ItemGroup>
1515

examples/AvroSpecific/AvroSpecific.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.6.3" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.SchemaRegistry.Serdes.Avro" Version="1.7.0" /> -->
1313
<ProjectReference Include="../../src/Confluent.SchemaRegistry.Serdes.Avro/Confluent.SchemaRegistry.Serdes.Avro.csproj" />
1414
</ItemGroup>
1515

examples/ConfluentCloud/ConfluentCloud.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
10+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0" /> -->
1111
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1212
</ItemGroup>
1313

examples/Consumer/Consumer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
11+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0" /> -->
1212
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1313
</ItemGroup>
1414

examples/Consumer/Program.cs

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ public static void Run_Consume(string brokerList, List<string> topics, Cancellat
6565
{
6666
// Since a cooperative assignor (CooperativeSticky) has been configured, the
6767
// partition assignment is incremental (adds partitions to any existing assignment).
68-
Console.WriteLine($"Incremental partition assignment: [{string.Join(", ", partitions)}]");
68+
Console.WriteLine(
69+
"Partitions incrementally assigned: [" +
70+
string.Join(',', partitions.Select(p => p.Partition.Value)) +
71+
"], all: [" +
72+
string.Join(',', c.Assignment.Concat(partitions).Select(p => p.Partition.Value)) +
73+
"]");
6974

7075
// Possibly manually specify start offsets by returning a list of topic/partition/offsets
7176
// to assign to, e.g.:
@@ -75,7 +80,13 @@ public static void Run_Consume(string brokerList, List<string> topics, Cancellat
7580
{
7681
// Since a cooperative assignor (CooperativeSticky) has been configured, the revoked
7782
// assignment is incremental (may remove only some partitions of the current assignment).
78-
Console.WriteLine($"Incremental partition revokation: [{string.Join(", ", partitions)}]");
83+
var remaining = c.Assignment.Where(atp => partitions.Where(rtp => rtp.TopicPartition == atp).Count() == 0);
84+
Console.WriteLine(
85+
"Partitions incrementally revoked: [" +
86+
string.Join(',', partitions.Select(p => p.Partition.Value)) +
87+
"], remaining: [" +
88+
string.Join(',', remaining.Select(p => p.Partition.Value)) +
89+
"]");
7990
})
8091
.SetPartitionsLostHandler((c, partitions) =>
8192
{

examples/ExactlyOnce/ExactlyOnce.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.6.3" /> -->
12+
<!-- nuget package reference: <PackageReference Include="Confluent.Kafka" Version="1.7.0" /> -->
1313
<ProjectReference Include="../../src/Confluent.Kafka/Confluent.Kafka.csproj" />
1414
<PackageReference Include="Microsoft.FASTER.Core" Version="1.8.0" />
1515
</ItemGroup>

0 commit comments

Comments
 (0)