This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 237b7989d79 [fix][build] Fix potential insufficient protostuff-related
configs (#21629)
237b7989d79 is described below
commit 237b7989d797b1eecbd38afa23f63e99858955ef
Author: Yuri Mizushima <[email protected]>
AuthorDate: Thu Jan 25 13:32:58 2024 +0900
[fix][build] Fix potential insufficient protostuff-related configs (#21629)
(cherry picked from commit de4edd0fd57919b506928238a0013c24744c2cdd)
---
pom.xml | 25 +++++++++++++++++++++++++
pulsar-broker/pom.xml | 24 ------------------------
pulsar-transaction/coordinator/pom.xml | 24 ------------------------
3 files changed, 25 insertions(+), 48 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1e34501e2a5..cfbd13c19c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2019,6 +2019,31 @@ 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>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index aae54780b5a..7943ba71316 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -611,30 +611,6 @@
</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>
- <property>
- <name>proto_path</name>
- <value>${project.parent.basedir}</value>
- </property>
- <property>
- <name>proto_search_strategy</name>
- <value>2</value>
- </property>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.github.splunk.lightproto</groupId>
<artifactId>lightproto-maven-plugin</artifactId>
diff --git a/pulsar-transaction/coordinator/pom.xml
b/pulsar-transaction/coordinator/pom.xml
index 01ef9d4ef18..740e13fda6a 100644
--- a/pulsar-transaction/coordinator/pom.xml
+++ b/pulsar-transaction/coordinator/pom.xml
@@ -81,30 +81,6 @@
</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>
- <property>
- <name>proto_path</name>
-
<value>${project.parent.parent.basedir}</value>
- </property>
- <property>
- <name>proto_search_strategy</name>
- <value>2</value>
- </property>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>com.github.splunk.lightproto</groupId>
<artifactId>lightproto-maven-plugin</artifactId>
