From 32cbc139be79e86c42d39686effaff0016b0533d Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 12 Jun 2026 01:04:13 +0300 Subject: [PATCH 1/2] [fix][build] Fix generateOpenApiSpecs task which is used in Pulsar release process --- pulsar-broker/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pulsar-broker/build.gradle.kts b/pulsar-broker/build.gradle.kts index efc68b05e936a..17bc9c824f5f7 100644 --- a/pulsar-broker/build.gradle.kts +++ b/pulsar-broker/build.gradle.kts @@ -221,6 +221,10 @@ lightproto { // The plugin's default `swaggerDeps` resolver dependencies target javax.ws.rs; declaring // our own dependencies on the configuration replaces them with the jakarta variants. dependencies { + // The component metadata rule in pulsar.java-conventions replaces + // com.sun.activation:jakarta.activation with versionless jakarta.activation-api/ + // angus-activation deps, so swaggerDeps needs the platform to pin their versions. + "swaggerDeps"(enforcedPlatform(project(":pulsar-dependencies"))) "swaggerDeps"(libs.commons.lang3) "swaggerDeps"(libs.swagger.jaxrs2) "swaggerDeps"(libs.jakarta.ws.rs.api) From dbc5f9eda60571d616f3bd87b49a2b700035c81a Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 12 Jun 2026 01:22:23 +0300 Subject: [PATCH 2/2] Include ScalableTopics, MetadataMigration and Segments in admin v2 OpenAPI spec --- pulsar-broker/build.gradle.kts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pulsar-broker/build.gradle.kts b/pulsar-broker/build.gradle.kts index 17bc9c824f5f7..aeee78be60398 100644 --- a/pulsar-broker/build.gradle.kts +++ b/pulsar-broker/build.gradle.kts @@ -258,12 +258,15 @@ registerSwaggerTask("swaggerAdminV2", "swagger", "admin-v2.json") { "org.apache.pulsar.broker.admin.v2.Brokers", "org.apache.pulsar.broker.admin.v2.Clusters", "org.apache.pulsar.broker.admin.v2.Functions", + "org.apache.pulsar.broker.admin.v2.MetadataMigration", "org.apache.pulsar.broker.admin.v2.Namespaces", "org.apache.pulsar.broker.admin.v2.NonPersistentTopics", "org.apache.pulsar.broker.admin.v2.PersistentTopics", "org.apache.pulsar.broker.admin.v2.ResourceGroups", "org.apache.pulsar.broker.admin.v2.ResourceQuotas", + "org.apache.pulsar.broker.admin.v2.ScalableTopics", "org.apache.pulsar.broker.admin.v2.SchemasResource", + "org.apache.pulsar.broker.admin.v2.Segments", "org.apache.pulsar.broker.admin.v2.Tenants", "org.apache.pulsar.broker.admin.v2.Worker", "org.apache.pulsar.broker.admin.v2.WorkerStats",