From 3706e8b533dad92963efee0d5f2400a440347040 Mon Sep 17 00:00:00 2001
From: Matteo Merli <mmerli@apache.org>
Date: Mon, 16 Mar 2026 17:59:18 -0700
Subject: [PATCH] [improve][build] Upgrade LightProto to 0.6.1

Upgrade the LightProto Maven plugin from 0.4 (com.github.splunk.lightproto)
to 0.6.1 (io.streamnative.lightproto).

Key changes:
- Update groupId from com.github.splunk.lightproto to io.streamnative.lightproto
- Remove the properties-maven-plugin workaround that was needed to set
  proto_path and proto_search_strategy system properties, as 0.6.x handles
  proto resolution natively via the extraProtoPaths configuration
- Configure extraProtoPaths for the transaction coordinator module to
  resolve cross-module proto imports
- Update SpotBugs exclusions for generated proto code
---
 pom.xml                                       | 33 +------------------
 pulsar-broker/pom.xml                         |  5 ++-
 .../main/proto/TransactionPendingAck.proto    |  2 +-
 pulsar-common/pom.xml                         |  2 +-
 pulsar-transaction/coordinator/pom.xml        |  7 +++-
 .../src/main/resources/findbugsExclude.xml    |  2 +-
 6 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/pom.xml b/pom.xml
index cd071f16fb15c..c3a9e357f3826 100644
--- a/pom.xml
+++ b/pom.xml
@@ -352,7 +352,6 @@ flexible messaging model and an intuitive client API.</description>
     <maven-shade-plugin>3.6.0</maven-shade-plugin>
     <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
-    <properties-maven-plugin.version>1.1.0</properties-maven-plugin.version>
     <nifi-nar-maven-plugin.version>1.5.0</nifi-nar-maven-plugin.version>
     <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
@@ -364,7 +363,7 @@ flexible messaging model and an intuitive client API.</description>
     <errorprone.version>2.45.0</errorprone.version>
     <errorprone-slf4j.version>0.1.29</errorprone-slf4j.version>
     <j2objc-annotations.version>1.3</j2objc-annotations.version>
-    <lightproto-maven-plugin.version>0.4</lightproto-maven-plugin.version>
+    <lightproto-maven-plugin.version>0.6.1</lightproto-maven-plugin.version>
     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
     <dependency-check-maven.version>12.1.0</dependency-check-maven.version>
     <roaringbitmap.version>1.6.9</roaringbitmap.version>
@@ -2230,31 +2229,6 @@ flexible messaging model and an intuitive client API.</description>
             </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>properties-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>initialize</phase>
-            <goals>
-              <goal>set-system-properties</goal>
-            </goals>
-            <configuration>
-              <properties combine.children="append">
-                <!-- for lightproto (protostuff) -->
-                <property>
-                  <name>proto_path</name>
-                  <value>${pulsar.basedir}</value>
-                </property>
-                <property>
-                  <name>proto_search_strategy</name>
-                  <value>2</value>
-                </property>
-              </properties>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
 
     <pluginManagement>
@@ -2380,11 +2354,6 @@ flexible messaging model and an intuitive client API.</description>
             <omitVisitors>ConstructorThrow,FindPublicAttributes,SharedVariableAtomicityDetector,UnreadFields,MultipleInstantiationsOfSingletons,InitializeNonnullFieldsInConstructor,FindNullDeref</omitVisitors>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>properties-maven-plugin</artifactId>
-          <version>${properties-maven-plugin.version}</version>
-        </plugin>
         <plugin>
           <groupId>io.fabric8</groupId>
           <artifactId>docker-maven-plugin</artifactId>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 328b0d377d57a..f2d618a7fee3b 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -659,7 +659,7 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.github.splunk.lightproto</groupId>
+        <groupId>io.streamnative.lightproto</groupId>
         <artifactId>lightproto-maven-plugin</artifactId>
         <version>${lightproto-maven-plugin.version}</version>
         <configuration>
@@ -668,6 +668,9 @@
             <source>${project.basedir}/src/main/proto/ResourceUsage.proto</source>
             <source>${project.basedir}/src/main/proto/DelayedMessageIndexBucketSegment.proto</source>
           </sources>
+          <extraProtoPaths>
+            <extraProtoPath>${pulsar.basedir}</extraProtoPath>
+          </extraProtoPaths>
           <targetSourcesSubDir>generated-sources/lightproto/java</targetSourcesSubDir>
           <targetTestSourcesSubDir>generated-sources/lightproto/java</targetTestSourcesSubDir>
         </configuration>
diff --git a/pulsar-broker/src/main/proto/TransactionPendingAck.proto b/pulsar-broker/src/main/proto/TransactionPendingAck.proto
index cdf7dec6b2520..10ad8cc30ec88 100644
--- a/pulsar-broker/src/main/proto/TransactionPendingAck.proto
+++ b/pulsar-broker/src/main/proto/TransactionPendingAck.proto
@@ -19,7 +19,7 @@
 syntax = "proto2";
 
 import "pulsar-common/src/main/proto/PulsarApi.proto";
-package pulsar.proto;
+package pulsar.proto.pendingack;
 option java_package = "org.apache.pulsar.broker.transaction.pendingack.proto";
 option optimize_for = LITE_RUNTIME;
 
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index 09e42ff618828..ce315b6e4ff90 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -324,7 +324,7 @@
       </plugin>
 
       <plugin>
-        <groupId>com.github.splunk.lightproto</groupId>
+        <groupId>io.streamnative.lightproto</groupId>
         <artifactId>lightproto-maven-plugin</artifactId>
         <version>${lightproto-maven-plugin.version}</version>
         <executions>
diff --git a/pulsar-transaction/coordinator/pom.xml b/pulsar-transaction/coordinator/pom.xml
index f49d7ed583467..40fafa118464c 100644
--- a/pulsar-transaction/coordinator/pom.xml
+++ b/pulsar-transaction/coordinator/pom.xml
@@ -88,9 +88,14 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.github.splunk.lightproto</groupId>
+                <groupId>io.streamnative.lightproto</groupId>
                 <artifactId>lightproto-maven-plugin</artifactId>
                 <version>${lightproto-maven-plugin.version}</version>
+                <configuration>
+                    <extraProtoPaths>
+                        <extraProtoPath>${pulsar.basedir}</extraProtoPath>
+                    </extraProtoPaths>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
diff --git a/pulsar-transaction/coordinator/src/main/resources/findbugsExclude.xml b/pulsar-transaction/coordinator/src/main/resources/findbugsExclude.xml
index a81fce11f4d21..68d915f10f186 100644
--- a/pulsar-transaction/coordinator/src/main/resources/findbugsExclude.xml
+++ b/pulsar-transaction/coordinator/src/main/resources/findbugsExclude.xml
@@ -21,7 +21,7 @@
 <FindBugsFilter>
   <Match>
     <Class name="~org.apache.pulsar.transaction.coordinator.proto.*"/>
-    <Bug pattern="UUF_UNUSED_FIELD"/>
+    <Bug pattern="UUF_UNUSED_FIELD,DE_MIGHT_IGNORE,REC_CATCH_EXCEPTION"/>
   </Match>
   <!-- Ignore violations that were present when the rule was enabled -->
   <Match>