From e696220bbe7327b291b07a60ef567b8eba53f28c Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Mon, 8 May 2023 23:25:57 -0500 Subject: [PATCH] Use shaded cache module for Reactive client (#403) * Use shaded cache module for Reactive client - use `pulsar-client-reactive-producer-cache-caffeine-shaded` - exclude `pulsar-client` from reactive client modules as it brings in unwanted transitive deps --- spring-pulsar-dependencies/build.gradle | 2 +- spring-pulsar-reactive/build.gradle | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/spring-pulsar-dependencies/build.gradle b/spring-pulsar-dependencies/build.gradle index 41728008..8c1ce873 100644 --- a/spring-pulsar-dependencies/build.gradle +++ b/spring-pulsar-dependencies/build.gradle @@ -26,7 +26,7 @@ dependencies { api "com.google.protobuf:protobuf-java:$protobufJavaVersion" api "org.apache.pulsar:pulsar-client-all:$pulsarVersion" api "org.apache.pulsar:pulsar-client-reactive-adapter:$pulsarClientReactiveVersion" - api "org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine:$pulsarClientReactiveVersion" + api "org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded:$pulsarClientReactiveVersion" api "org.springframework.cloud:spring-cloud-stream:$springCloudStreamVersion" api "org.springframework.cloud:spring-cloud-stream-test-support:$springCloudStreamVersion" api "org.springframework.pulsar:spring-pulsar-spring-boot-starter:$springPulsarStarterVersion" diff --git a/spring-pulsar-reactive/build.gradle b/spring-pulsar-reactive/build.gradle index 261ec536..d1ca9873 100644 --- a/spring-pulsar-reactive/build.gradle +++ b/spring-pulsar-reactive/build.gradle @@ -7,7 +7,15 @@ description = 'Spring Pulsar Reactive Support' dependencies { api project (':spring-pulsar') - api 'org.apache.pulsar:pulsar-client-reactive-adapter' + api ('org.apache.pulsar:pulsar-client-reactive-adapter') { + // spring-pulsar includes a pulsar-client with its unwanted transitive deps excluded + exclude group: "org.apache.pulsar", module: "pulsar-client" + } + api("org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded") { + // (above) we include a pulsar-client-reactive-adapter whose pulsar-client with + // unwanted transitive deps excluded + exclude group: "org.apache.pulsar", module: "pulsar-client-reactive-adapter" + } implementation 'com.fasterxml.jackson.core:jackson-core' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.google.code.findbugs:jsr305' @@ -17,7 +25,6 @@ dependencies { optional 'com.google.protobuf:protobuf-java' optional 'com.jayway.jsonpath:json-path' optional 'io.projectreactor:reactor-core' - optional 'org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine' testImplementation project(':spring-pulsar-test') testRuntimeOnly 'ch.qos.logback:logback-classic'