Skip to content

Commit 237b798

Browse files
equanzlhotari
authored andcommitted
[fix][build] Fix potential insufficient protostuff-related configs (apache#21629)
(cherry picked from commit de4edd0)
1 parent b92af78 commit 237b798

File tree

3 files changed

+25
-48
lines changed

3 files changed

+25
-48
lines changed

pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2019,6 +2019,31 @@ flexible messaging model and an intuitive client API.</description>
20192019
</execution>
20202020
</executions>
20212021
</plugin>
2022+
<plugin>
2023+
<groupId>org.codehaus.mojo</groupId>
2024+
<artifactId>properties-maven-plugin</artifactId>
2025+
<executions>
2026+
<execution>
2027+
<phase>initialize</phase>
2028+
<goals>
2029+
<goal>set-system-properties</goal>
2030+
</goals>
2031+
<configuration>
2032+
<properties combine.children="append">
2033+
<!-- for lightproto (protostuff) -->
2034+
<property>
2035+
<name>proto_path</name>
2036+
<value>${pulsar.basedir}</value>
2037+
</property>
2038+
<property>
2039+
<name>proto_search_strategy</name>
2040+
<value>2</value>
2041+
</property>
2042+
</properties>
2043+
</configuration>
2044+
</execution>
2045+
</executions>
2046+
</plugin>
20222047
</plugins>
20232048

20242049
<pluginManagement>

pulsar-broker/pom.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -611,30 +611,6 @@
611611
</execution>
612612
</executions>
613613
</plugin>
614-
<plugin>
615-
<groupId>org.codehaus.mojo</groupId>
616-
<artifactId>properties-maven-plugin</artifactId>
617-
<executions>
618-
<execution>
619-
<phase>initialize</phase>
620-
<goals>
621-
<goal>set-system-properties</goal>
622-
</goals>
623-
<configuration>
624-
<properties>
625-
<property>
626-
<name>proto_path</name>
627-
<value>${project.parent.basedir}</value>
628-
</property>
629-
<property>
630-
<name>proto_search_strategy</name>
631-
<value>2</value>
632-
</property>
633-
</properties>
634-
</configuration>
635-
</execution>
636-
</executions>
637-
</plugin>
638614
<plugin>
639615
<groupId>com.github.splunk.lightproto</groupId>
640616
<artifactId>lightproto-maven-plugin</artifactId>

pulsar-transaction/coordinator/pom.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,30 +81,6 @@
8181
</execution>
8282
</executions>
8383
</plugin>
84-
<plugin>
85-
<groupId>org.codehaus.mojo</groupId>
86-
<artifactId>properties-maven-plugin</artifactId>
87-
<executions>
88-
<execution>
89-
<phase>initialize</phase>
90-
<goals>
91-
<goal>set-system-properties</goal>
92-
</goals>
93-
<configuration>
94-
<properties>
95-
<property>
96-
<name>proto_path</name>
97-
<value>${project.parent.parent.basedir}</value>
98-
</property>
99-
<property>
100-
<name>proto_search_strategy</name>
101-
<value>2</value>
102-
</property>
103-
</properties>
104-
</configuration>
105-
</execution>
106-
</executions>
107-
</plugin>
10884
<plugin>
10985
<groupId>com.github.splunk.lightproto</groupId>
11086
<artifactId>lightproto-maven-plugin</artifactId>

0 commit comments

Comments
 (0)