Skip to content

Commit de4edd0

Browse files
equanzequanz
authored
[fix][build] Fix potential insufficient protostuff-related configs (apache#21629)
1 parent 4198ed2 commit de4edd0

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
@@ -1875,6 +1875,31 @@ flexible messaging model and an intuitive client API.</description>
18751875
</execution>
18761876
</executions>
18771877
</plugin>
1878+
<plugin>
1879+
<groupId>org.codehaus.mojo</groupId>
1880+
<artifactId>properties-maven-plugin</artifactId>
1881+
<executions>
1882+
<execution>
1883+
<phase>initialize</phase>
1884+
<goals>
1885+
<goal>set-system-properties</goal>
1886+
</goals>
1887+
<configuration>
1888+
<properties combine.children="append">
1889+
<!-- for lightproto (protostuff) -->
1890+
<property>
1891+
<name>proto_path</name>
1892+
<value>${pulsar.basedir}</value>
1893+
</property>
1894+
<property>
1895+
<name>proto_search_strategy</name>
1896+
<value>2</value>
1897+
</property>
1898+
</properties>
1899+
</configuration>
1900+
</execution>
1901+
</executions>
1902+
</plugin>
18781903
</plugins>
18791904

18801905
<pluginManagement>

‎pulsar-broker/pom.xml

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