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
33 changes: 1 addition & 32 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion pulsar-broker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pulsar-broker/src/main/proto/TransactionPendingAck.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion pulsar-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion pulsar-transaction/coordinator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading