This is an automated email from the ASF dual-hosted git repository. tison 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 de4edd0fd57 [fix][build] Fix potential insufficient protostuff-related configs (#21629) de4edd0fd57 is described below commit de4edd0fd57919b506928238a0013c24744c2cdd Author: Yuri Mizushima <equ...@apache.org> AuthorDate: Thu Jan 25 13:32:58 2024 +0900 [fix][build] Fix potential insufficient protostuff-related configs (#21629) --- 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 520547669bf..ab25a691b06 100644 --- a/pom.xml +++ b/pom.xml @@ -1875,6 +1875,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 054fcd87335..9dd319f7911 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -613,30 +613,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 23c77b928eb..e245e97a4e2 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>