Skip to content

Commit c4f2922

Browse files
committed
fixup! Upgrade to Pulsar 4.0.6
1 parent d4037f5 commit c4f2922

File tree

5 files changed

+27
-9
lines changed

5 files changed

+27
-9
lines changed

spring-boot-project/spring-boot-autoconfigure/build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ dependencies {
5353
dockerTestImplementation("org.testcontainers:junit-jupiter")
5454
dockerTestImplementation("org.testcontainers:mongodb")
5555
dockerTestImplementation("org.testcontainers:neo4j")
56-
dockerTestImplementation("org.testcontainers:pulsar")
56+
dockerTestImplementation("org.testcontainers:pulsar") {
57+
exclude group: "commons-logging", module: "commons-logging"
58+
}
5759
dockerTestImplementation("org.testcontainers:testcontainers")
5860

5961
optional("co.elastic.clients:elasticsearch-java") {
@@ -207,8 +209,12 @@ dependencies {
207209
optional("org.springframework.data:spring-data-redis")
208210
optional("org.springframework.graphql:spring-graphql")
209211
optional("org.springframework.hateoas:spring-hateoas")
210-
optional("org.springframework.pulsar:spring-pulsar")
211-
optional("org.springframework.pulsar:spring-pulsar-reactive")
212+
optional("org.springframework.pulsar:spring-pulsar") {
213+
exclude group: "commons-logging", module: "commons-logging"
214+
}
215+
optional("org.springframework.pulsar:spring-pulsar-reactive") {
216+
exclude group: "commons-logging", module: "commons-logging"
217+
}
212218
optional("org.springframework.security:spring-security-acl")
213219
optional("org.springframework.security:spring-security-config")
214220
optional("org.springframework.security:spring-security-data")

spring-boot-project/spring-boot-docs/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,12 @@ dependencies {
157157
implementation("org.springframework.kafka:spring-kafka-test") {
158158
exclude group: "commons-logging", module: "commons-logging"
159159
}
160-
implementation("org.springframework.pulsar:spring-pulsar")
161-
implementation("org.springframework.pulsar:spring-pulsar-reactive")
160+
implementation("org.springframework.pulsar:spring-pulsar") {
161+
exclude group: "commons-logging", module: "commons-logging"
162+
}
163+
implementation("org.springframework.pulsar:spring-pulsar-reactive") {
164+
exclude group: "commons-logging", module: "commons-logging"
165+
}
162166
implementation("org.springframework.restdocs:spring-restdocs-mockmvc")
163167
implementation("org.springframework.restdocs:spring-restdocs-restassured")
164168
implementation("org.springframework.restdocs:spring-restdocs-webtestclient")

spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar-reactive/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ description = "Starter for using Spring for Apache Pulsar Reactive"
2222

2323
dependencies {
2424
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
25-
api("org.springframework.pulsar:spring-pulsar-reactive")
25+
api("org.springframework.pulsar:spring-pulsar-reactive") {
26+
exclude group: "commons-logging", module: "commons-logging"
27+
}
2628
}
2729

2830
checkRuntimeClasspathForConflicts {

spring-boot-project/spring-boot-starters/spring-boot-starter-pulsar/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ description = "Starter for using Spring for Apache Pulsar"
2222

2323
dependencies {
2424
api(project(":spring-boot-project:spring-boot-starters:spring-boot-starter"))
25-
api("org.springframework.pulsar:spring-pulsar")
25+
api("org.springframework.pulsar:spring-pulsar") {
26+
exclude group: "commons-logging", module: "commons-logging"
27+
}
2628
}
2729

2830
checkRuntimeClasspathForConflicts {

spring-boot-project/spring-boot-testcontainers/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ dependencies {
6565
dockerTestImplementation("org.springframework.data:spring-data-redis")
6666
dockerTestImplementation("org.springframework.kafka:spring-kafka")
6767
dockerTestImplementation("org.springframework.ldap:spring-ldap-core")
68-
dockerTestImplementation("org.springframework.pulsar:spring-pulsar")
68+
dockerTestImplementation("org.springframework.pulsar:spring-pulsar") {
69+
exclude group: "commons-logging", module: "commons-logging"
70+
}
6971
dockerTestImplementation("org.testcontainers:junit-jupiter")
7072

7173
dockerTestRuntimeOnly("com.oracle.database.r2dbc:oracle-r2dbc")
@@ -115,7 +117,9 @@ dependencies {
115117
testImplementation("org.springframework.amqp:spring-rabbit")
116118
testImplementation("org.springframework.data:spring-data-redis")
117119
testImplementation("org.springframework.kafka:spring-kafka")
118-
testImplementation("org.springframework.pulsar:spring-pulsar")
120+
testImplementation("org.springframework.pulsar:spring-pulsar") {
121+
exclude group: "commons-logging", module: "commons-logging"
122+
}
119123
testImplementation("org.testcontainers:junit-jupiter")
120124
}
121125

0 commit comments

Comments
 (0)