This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 2bd9dd031dd [improve][build] Upgrade LightProto to 0.6.1 (#25332)
2bd9dd031dd is described below
commit 2bd9dd031dde956789ef235028d91f1ac93a9764
Author: Matteo Merli <[email protected]>
AuthorDate: Tue Mar 17 08:25:59 2026 -0700
[improve][build] Upgrade LightProto to 0.6.1 (#25332)
---
pom.xml | 33 +---------------------
pulsar-broker/pom.xml | 5 +++-
.../src/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 cd071f16fb1..c3a9e357f38 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 328b0d377d5..f2d618a7fee 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 cdf7dec6b25..10ad8cc30ec 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 09e42ff6188..ce315b6e4ff 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 f49d7ed5834..40fafa11846 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 a81fce11f4d..68d915f10f1 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>
