Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,6 @@ Provides a Gradle https://docs.gradle.org/current/userguide/java_platform_plugin
=== spring-pulsar-docs
Provides reference docs and handles aggregating javadocs.

=== spring-pulsar-reactive
Provides the API to access Apache Pulsar using a Reactive client.

=== spring-pulsar-sample-apps
Provides sample applications to illustrate Spring for Apache Pulsar functionality as well as provide ability for quick manual verification during development.

Expand Down
1 change: 0 additions & 1 deletion gradle/aggregate-jacoco-report.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ project.afterEvaluate {

dependsOn(
':spring-pulsar:compileJava',
':spring-pulsar-reactive:compileJava',
':spring-pulsar-cache-provider:compileJava',
':spring-pulsar-cache-provider:test',
':spring-pulsar-cache-provider-caffeine:compileJava')
Expand Down
2 changes: 0 additions & 2 deletions gradle/antora-docs.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ def generateAttributes() {
def springCloudStreamVersion = versionCatalog.findVersion("spring-cloud-stream").orElseThrow().displayName
def pulsarClientVersion = versionCatalog.findVersion("pulsar").orElseThrow().displayName
def pulsarClientVersionFamily = pulsarClientVersion.tokenize(".")[0] + "." + pulsarClientVersion.tokenize(".")[1] + ".x"
def pulsarClientReactiveVersion = versionCatalog.findVersion("pulsar-reactive").orElseThrow().displayName
return ['is-snapshot-version': project.version.endsWith("-SNAPSHOT"),
'pulsar-client-version': pulsarClientVersion ?: 'current',
'pulsar-client-version-family': pulsarClientVersionFamily ?: 'current',
'pulsar-client-reactive-version': pulsarClientReactiveVersion ?: 'current',
'spring-boot-version': springBootVersionForDocs ?: 'current',
'spring-cloud-stream-version': springCloudStreamVersion ?: 'current',
'spring-framework-version': springFrameworkVersion ?: 'current',
Expand Down
1 change: 0 additions & 1 deletion gradle/jacoco-conventions.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
def javaProjects = [ 'spring-pulsar',
'spring-pulsar-cache-provider',
'spring-pulsar-cache-provider-caffeine',
'spring-pulsar-reactive',
'spring-pulsar-test' ]


Expand Down
11 changes: 2 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ micrometer-docs-gen = "1.0.4"
micrometer-tracing = "1.6.0-RC1"
protobuf = "3.25.8"
pulsar = "4.1.1"
pulsar-reactive = "0.7.0"
reactor = "2025.0.0-M7"
spring = "7.0.0-M9"
# tests
assertj = "3.27.6"
Expand All @@ -23,8 +21,8 @@ junit = "6.0.0"
hamcrest = "3.0"
mockito = "5.17.0"
spring-dep-mgmt = "1.1.7"
spring-boot = "4.0.0-SNAPSHOT"
spring-boot-for-docs = "4.0.0-SNAPSHOT"
spring-boot = "4.0.0-M3"
spring-boot-for-docs = "4.0.0-M3"
spring-cloud-stream = "5.0.0-SNAPSHOT"
system-lambda = "1.2.1"
testcontainers = "1.21.3"
Expand Down Expand Up @@ -52,10 +50,6 @@ micrometer-tracing-bom = { module = "io.micrometer:micrometer-tracing-bom", vers
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
protobuf-protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
pulsar-client-all = { module = "org.apache.pulsar:pulsar-client-all", version.ref = "pulsar" }
pulsar-client-reactive-api = { module = "org.apache.pulsar:pulsar-client-reactive-api", version.ref = "pulsar-reactive" }
pulsar-client-reactive-adapter = { module = "org.apache.pulsar:pulsar-client-reactive-adapter", version.ref = "pulsar-reactive" }
pulsar-client-reactive-producer-cache-caffeine-shaded = { module = "org.apache.pulsar:pulsar-client-reactive-producer-cache-caffeine-shaded", version.ref = "pulsar-reactive" }
reactor-bom = { module = "io.projectreactor:reactor-bom", version.ref = "reactor" }
spring-bom = { module = "org.springframework:spring-framework-bom", version.ref = "spring" }
# Testing libs
assertj-bom = { module = "org.assertj:assertj-bom", version.ref = "assertj" }
Expand All @@ -66,7 +60,6 @@ junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
mockito-bom = { module = "org.mockito:mockito-bom", version.ref = "mockito" }
spring-boot-starter-amqp = { module = "org.springframework.boot:spring-boot-starter-amqp", version.ref = "spring-boot" }
spring-boot-starter-pulsar = { module = "org.springframework.boot:spring-boot-starter-pulsar", version.ref = "spring-boot" }
spring-boot-starter-pulsar-reactive = { module = "org.springframework.boot:spring-boot-starter-pulsar-reactive", version.ref = "spring-boot" }
spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "spring-boot" }
spring-boot-testcontainers = { module = "org.springframework.boot:spring-boot-testcontainers", version.ref = "spring-boot" }
system-lambda = { module = "com.github.stefanbirkner:system-lambda", version.ref = "system-lambda" }
Expand Down
1 change: 0 additions & 1 deletion gradle/nullability-conventions.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
def javaProjects = [ 'spring-pulsar',
'spring-pulsar-cache-provider',
'spring-pulsar-cache-provider-caffeine',
'spring-pulsar-reactive',
'spring-pulsar-test' ]

allprojects {
Expand Down
4 changes: 1 addition & 3 deletions gradle/version-catalog-update.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ def isNonStable = { String version ->
def trustedLibPrefixes = [
"org.springframework.",
"io.micrometer.",
"io.spring.dependency-management:",
"org.apache.pulsar:pulsar-client-reactive",
"io.projectreactor:reactor"
"io.spring.dependency-management:"
]

tasks.named("dependencyUpdates").configure {
Expand Down
4 changes: 0 additions & 4 deletions integration-tests/integration-tests.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ repositories {

dependencies {
intTestImplementation project(':spring-pulsar')
intTestImplementation project(':spring-pulsar-reactive')
intTestImplementation project(':spring-pulsar-test')
intTestImplementation 'org.awaitility:awaitility'
intTestImplementation 'org.testcontainers:junit-jupiter'
Expand All @@ -26,9 +25,6 @@ dependencies {
intTestImplementation(libs.spring.boot.starter.pulsar) {
exclude group: "org.springframework.pulsar", module: "spring-pulsar"
}
intTestImplementation(libs.spring.boot.starter.pulsar.reactive) {
exclude group: "org.springframework.pulsar", module: "spring-pulsar-reactive"
}
intTestImplementation libs.spring.boot.testcontainers
intTestRuntimeOnly 'org.junit.platform:junit-platform-launcher'
intTestRuntimeOnly libs.logback.classic
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ class ImperativeAppTests implements SpringBootTestImperativeApp {

}

@Nested
class ReactiveAppTests implements SpringBootTestReactiveApp {

}

}

@Nested
Expand All @@ -50,11 +45,6 @@ class ImperativeAppTests implements SpringBootTestImperativeApp {

}

@Nested
class ReactiveAppTests implements SpringBootTestReactiveApp {

}

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,4 @@ class ImperativeAppTests implements SpringBootTestImperativeApp {

}

@Nested
class ReactiveAppTests implements SpringBootTestReactiveApp {

}

}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.stream.IntStream;

import org.awaitility.Awaitility;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down Expand Up @@ -68,25 +67,6 @@ void produceConsumeWithDefaultTenantNamespace(CapturedOutput output,

}

@Nested
@SpringBootTest(classes = ReactiveAppConfig.class,
properties = { "spring.pulsar.defaults.topic.tenant=my-tenant-r",
"spring.pulsar.defaults.topic.namespace=my-namespace-r" })
@ExtendWith(OutputCaptureExtension.class)
@ActiveProfiles("inttest.pulsar.reactive")
@Disabled("Flaky -> see https://github.com/spring-projects/spring-pulsar/issues/1040")
class WithReactiveApp {

@Test
void produceConsumeWithDefaultTenantNamespace(CapturedOutput output,
@Autowired PulsarAdministration pulsarAdmin) {
TestVerifyUtils.verifyProduceConsume(output, 10, (i) -> ReactiveAppConfig.MSG_PREFIX + i);
TestVerifyUtils.verifyTopicsLocatedInTenantAndNamespace(pulsarAdmin, ReactiveAppConfig.TENANT,
ReactiveAppConfig.NAMESPACE, ReactiveAppConfig.NFQ_TOPIC);
}

}

private static final class TestVerifyUtils {

static void verifyProduceConsume(CapturedOutput output, int numExpectedMessages,
Expand Down
Loading
Loading