Skip to content

Commit 826f250

Browse files
committed
Fix spring-kafka 2.4-2.9 test: remove hardcoded kafka-clients version
The test scenario hardcoded kafka-clients at 2.3.1, but spring-kafka 2.4+ requires matching kafka-clients versions (2.4+, 2.5+, etc.). Fix by removing the explicit kafka-clients dependency and letting spring-kafka's transitive dependency pull the correct version automatically.
1 parent cbd1621 commit 826f250

File tree

4 files changed

+10
-16
lines changed

4 files changed

+10
-16
lines changed

CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Release Notes.
1515
* Extend Feign plugin to support OpenFeign 10.x, 11.x, 12.1.
1616
* Extend Undertow plugin to support Undertow 2.1.x, 2.2.x, 2.3.x.
1717
* Extend GraphQL plugin to support graphql-java 18 -> 24 (20+ requires JDK 17).
18-
* Extend Spring Kafka plugin to support Spring Kafka 3.0 -> 3.3.
18+
* Extend Spring Kafka plugin to support Spring Kafka 2.4 -> 2.9 and 3.0 -> 3.3.
1919

2020
All issues and pull requests are [here](https://github.com/apache/skywalking/milestone/249?closed=1)
2121

docs/en/setup/service-agent/java-agent/Supported-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ metrics based on the tracing data.
7777
* [RocketMQ](https://github.com/apache/rocketmq) 3.x-> 5.x
7878
* [RocketMQ-gRPC](http://github.com/apache/rocketmq-clients) 5.x
7979
* [Kafka](http://kafka.apache.org) 0.11.0.0 -> 3.9.1
80-
* [Spring-Kafka](https://github.com/spring-projects/spring-kafka) Spring Kafka Consumer 1.3.x -> 2.3.x, 3.0.x -> 3.3.x (2.0.x and 2.1.x not tested and not recommended by [the official document](https://spring.io/projects/spring-kafka))
80+
* [Spring-Kafka](https://github.com/spring-projects/spring-kafka) Spring Kafka Consumer 1.3.x -> 3.3.x (2.0.x and 2.1.x not tested and not recommended by [the official document](https://spring.io/projects/spring-kafka))
8181
* [ActiveMQ](https://github.com/apache/activemq) 5.10.0 -> 5.15.4
8282
* [RabbitMQ](https://www.rabbitmq.com/) 3.x-> 5.x
8383
* [Spring-RabbitMQ](https://github.com/spring-projects/spring-amqp) 2.x -> 4.x

test/plugin/scenarios/spring-kafka-2.3.x-scenario/pom.xml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,8 @@
5555
</exclusion>
5656
</exclusions>
5757
</dependency>
58-
<dependency>
59-
<groupId>org.apache.kafka</groupId>
60-
<artifactId>kafka-clients</artifactId>
61-
<version>${kafka-version}</version>
62-
<exclusions>
63-
<exclusion>
64-
<artifactId>slf4j-api</artifactId>
65-
<groupId>*</groupId>
66-
</exclusion>
67-
</exclusions>
68-
</dependency>
58+
<!-- Let spring-kafka pull the matching kafka-clients version transitively.
59+
Each spring-kafka minor version requires a specific kafka-clients version. -->
6960
<dependency>
7061
<groupId>com.squareup.okhttp3</groupId>
7162
<artifactId>okhttp</artifactId>

test/plugin/scenarios/spring-kafka-2.3.x-scenario/support-version.list

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# Each Spring Kafka minor version requires a matching kafka-clients version.
18-
# 2.4+ needs kafka-clients 2.4+, but this scenario uses kafka-clients 2.3.1.
19-
# Extending to 2.4+ requires separate scenarios with version-matched kafka-clients.
2017
2.3.10.RELEASE
18+
2.4.13.RELEASE
19+
2.5.17.RELEASE
20+
2.6.15
21+
2.7.18
22+
2.8.11
23+
2.9.13

0 commit comments

Comments
 (0)