Merge pull request #19764 from scottfrederick

snicoll · snicoll · commit 797c30f952b9 · 2020-01-23T10:21:47.000+01:00
* pr/19764: Upgrade to Kafka 2.4.0 and Spring Kafka 2.4.1 Closes gh-19764
diff --git a/spring-boot-project/spring-boot-dependencies/build.gradle b/spring-boot-project/spring-boot-dependencies/build.gradle
@@ -949,7 +949,7 @@ bom {
 			]
 		}
 	}
-	library("Kafka", "2.3.1") {
+	library("Kafka", "2.4.0") {
 		group("org.apache.kafka") {
 			modules = [
 				"connect-api",
@@ -963,10 +963,12 @@ bom {
 				"kafka-streams",
 				"kafka-streams-scala_2.11",
 				"kafka-streams-scala_2.12",
+				"kafka-streams-scala_2.13",
 				"kafka-streams-test-utils",
 				"kafka-tools",
 				"kafka_2.11",
-				"kafka_2.12"
+				"kafka_2.12",
+				"kafka_2.13"
 			]
 		}
 	}
@@ -1633,7 +1635,7 @@ bom {
 			]
 		}
 	}
-	library("Spring Kafka", "2.3.4.RELEASE") {
+	library("Spring Kafka", "2.4.1.RELEASE") {
 		group("org.springframework.kafka") {
 			modules = [
 				"spring-kafka",

Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ bom {`
`949`	`949`	`]`
`950`	`950`	`}`
`951`	`951`	`}`
`952`		`- library("Kafka", "2.3.1") {`
	`952`	`+ library("Kafka", "2.4.0") {`
`953`	`953`	`group("org.apache.kafka") {`
`954`	`954`	`modules = [`
`955`	`955`	`"connect-api",`
`@@ -963,10 +963,12 @@ bom {`
`963`	`963`	`"kafka-streams",`
`964`	`964`	`"kafka-streams-scala_2.11",`
`965`	`965`	`"kafka-streams-scala_2.12",`
	`966`	`+ "kafka-streams-scala_2.13",`
`966`	`967`	`"kafka-streams-test-utils",`
`967`	`968`	`"kafka-tools",`
`968`	`969`	`"kafka_2.11",`
`969`		`- "kafka_2.12"`
	`970`	`+ "kafka_2.12",`
	`971`	`+ "kafka_2.13"`
`970`	`972`	`]`
`971`	`973`	`}`
`972`	`974`	`}`
`@@ -1633,7 +1635,7 @@ bom {`
`1633`	`1635`	`]`
`1634`	`1636`	`}`
`1635`	`1637`	`}`
`1636`		`- library("Spring Kafka", "2.3.4.RELEASE") {`
	`1638`	`+ library("Spring Kafka", "2.4.1.RELEASE") {`
`1637`	`1639`	`group("org.springframework.kafka") {`
`1638`	`1640`	`modules = [`
`1639`	`1641`	`"spring-kafka",`