Skip to content

Commit 43a39d1

Browse files
committed
Merge remote-tracking branch 'origin/master' into feature/replace-properties
2 parents c8cfd69 + f6cb911 commit 43a39d1

File tree

3 files changed

+48
-15
lines changed

3 files changed

+48
-15
lines changed

CHANGELOG.md

+45-14
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,45 @@
11
# Change Log
2-
- no changes!
32

4-
- no changes!
3+
## [2.13.1](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.13.1) (2024-05-03)
4+
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.13.1...2.13.1)
55

6-
- no changes!
76

8-
- no changes!
7+
## [2.13.1](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.13.1) (2024-05-03)
8+
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.13.0...2.13.1)
99

10+
**Merged pull requests:**
11+
12+
- Add Jackson dependency [\#94](https://github.com/bakdata/fluent-kafka-streams-tests/pull/94) ([@philipp94831](https://github.com/philipp94831))
13+
14+
## [2.13.0](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.13.0) (2024-04-17)
15+
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.12.0...2.13.0)
16+
17+
**Merged pull requests:**
18+
19+
- Add method to convert output topic to List [\#93](https://github.com/bakdata/fluent-kafka-streams-tests/pull/93) ([@JakobEdding](https://github.com/JakobEdding))
20+
21+
## [2.12.0](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.12.0) (2024-03-01)
22+
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.11.5...2.12.0)
23+
24+
**Merged pull requests:**
25+
26+
- Upgrade to Kafka 3.6 [\#90](https://github.com/bakdata/fluent-kafka-streams-tests/pull/90) ([@philipp94831](https://github.com/philipp94831))
27+
28+
## [2.11.5](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.11.5) (2024-02-28)
29+
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.11.4...2.11.5)
30+
31+
**Merged pull requests:**
32+
33+
- Add sources and javadoc to publication [\#89](https://github.com/bakdata/fluent-kafka-streams-tests/pull/89) ([@philipp94831](https://github.com/philipp94831))
34+
35+
## [2.11.4](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.11.4) (2024-02-27)
36+
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.11.3...2.11.4)
37+
38+
**Merged pull requests:**
39+
40+
- Add schema provider to Schema Registry mock JUnit 5 [\#88](https://github.com/bakdata/fluent-kafka-streams-tests/pull/88) ([@raminqaf](https://github.com/raminqaf))
41+
- Upgrade to Gradle 8.4 [\#87](https://github.com/bakdata/fluent-kafka-streams-tests/pull/87) ([@philipp94831](https://github.com/philipp94831))
42+
- Migrate azure pipeline to GH\-action [\#86](https://github.com/bakdata/fluent-kafka-streams-tests/pull/86) ([@yannick-roeder](https://github.com/yannick-roeder))
1043

1144
## [2.11.3](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.11.3) (2024-01-09)
1245
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.11.2...2.11.3)
@@ -204,7 +237,6 @@
204237
**Merged pull requests:**
205238

206239
- Support SchemaProvider [\#51](https://github.com/bakdata/fluent-kafka-streams-tests/pull/51) ([@torbsto](https://github.com/torbsto))
207-
- Add optional external SchemaRegistryMock to TestTopology class [\#52](https://github.com/bakdata/fluent-kafka-streams-tests/pull/52) ([@sergialonsaco](https://github.com/sergialonsaco))
208240
- Extract wiremock handler [\#53](https://github.com/bakdata/fluent-kafka-streams-tests/pull/53) ([@torbsto](https://github.com/torbsto))
209241

210242
## [2.3.0](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.3.0) (2021-02-12)
@@ -228,7 +260,6 @@
228260
**Merged pull requests:**
229261

230262
- Support topolgies with dynamic output topics [\#47](https://github.com/bakdata/fluent-kafka-streams-tests/pull/47) ([@torbsto](https://github.com/torbsto))
231-
- Example with springboot and junit5 [\#44](https://github.com/bakdata/fluent-kafka-streams-tests/pull/44) ([@ghost](https://github.com/ghost))
232263

233264
## [2.2.0](https://github.com/bakdata/fluent-kafka-streams-tests/tree/2.2.0) (2020-08-07)
234265
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/2.1.0...2.2.0)
@@ -303,16 +334,16 @@
303334
- Bump kafka version to 2.2.0 [\#18](https://github.com/bakdata/fluent-kafka-streams-tests/issues/18)
304335
- Upate Medium Links [\#14](https://github.com/bakdata/fluent-kafka-streams-tests/issues/14)
305336

306-
**Fixed bugs:**
307-
308-
- java.lang.ClassNotFoundException: com.fasterxml.jackson.annotation.JsonMerge [\#23](https://github.com/bakdata/fluent-kafka-streams-tests/issues/23)
309-
310337
**Merged pull requests:**
311338

312339
- Pinning jackson version to avoid conflict between wiremock and schema… [\#26](https://github.com/bakdata/fluent-kafka-streams-tests/pull/26) ([@AHeise](https://github.com/AHeise))
313340
- Set java version of SR mock to java 8 [\#24](https://github.com/bakdata/fluent-kafka-streams-tests/pull/24) ([@AHeise](https://github.com/AHeise))
314341
- \(\#19\) Mock subject version endpoints [\#20](https://github.com/bakdata/fluent-kafka-streams-tests/pull/20) ([@OneCricketeer](https://github.com/OneCricketeer))
315342

343+
**Fixed bugs:**
344+
345+
- java.lang.ClassNotFoundException: com.fasterxml.jackson.annotation.JsonMerge [\#23](https://github.com/bakdata/fluent-kafka-streams-tests/issues/23)
346+
316347
## [1.0.1](https://github.com/bakdata/fluent-kafka-streams-tests/tree/1.0.1) (2019-02-22)
317348
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/1.0.0...1.0.1)
318349

@@ -325,10 +356,6 @@
325356
## [1.0.0](https://github.com/bakdata/fluent-kafka-streams-tests/tree/1.0.0) (2019-02-21)
326357
[View commits](https://github.com/bakdata/fluent-kafka-streams-tests/compare/931e1a84bc220c27a44875d3d303fdc02a0ddb52...1.0.0)
327358

328-
**Fixed bugs:**
329-
330-
- Parellel test execution may result in conflicts in the state directory [\#7](https://github.com/bakdata/fluent-kafka-streams-tests/issues/7)
331-
332359
**Merged pull requests:**
333360

334361
- Using temp state dir to isolate test execution [\#8](https://github.com/bakdata/fluent-kafka-streams-tests/pull/8) ([@AHeise](https://github.com/AHeise))
@@ -342,3 +369,7 @@
342369
- Add README [\#1](https://github.com/bakdata/fluent-kafka-streams-tests/pull/1) ([@lawben](https://github.com/lawben))
343370
- Simplified avro example for blog article [\#4](https://github.com/bakdata/fluent-kafka-streams-tests/pull/4) ([@AHeise](https://github.com/AHeise))
344371
- Fix build and badges [\#2](https://github.com/bakdata/fluent-kafka-streams-tests/pull/2) ([@AHeise](https://github.com/AHeise))
372+
373+
**Fixed bugs:**
374+
375+
- Parellel test execution may result in conflicts in the state directory [\#7](https://github.com/bakdata/fluent-kafka-streams-tests/issues/7)

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=2.13.1-SNAPSHOT
1+
version=2.13.2-SNAPSHOT
22
org.gradle.caching=true
33
org.gradle.parallel=true
44
junit5Version=5.10.2

schema-registry-mock/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ dependencies {
77
"api"(group = "io.confluent", name = "kafka-streams-avro-serde", version = confluentVersion)
88

99
implementation(group = "org.wiremock", name = "wiremock", version = "3.4.2")
10+
// required because other dependencies use different Jackson versions if this library is used in test scope
11+
api(group = "com.fasterxml.jackson.core", name = "jackson-databind", version = "2.15.3")
1012

1113
val junit5Version: String by project
1214
testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api", version = junit5Version)

0 commit comments

Comments
 (0)