You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/09/09 07:22:36 UTC
[pulsar] 05/07: Fix build from submodules (broker,
transaction coordinator) (#11795)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit ff23ae9c4b9dc779d3b22259057997cc87db1f3d
Author: Nicolò Boschi <bo...@gmail.com>
AuthorDate: Thu Aug 26 13:47:56 2021 +0200
Fix build from submodules (broker, transaction coordinator) (#11795)
(cherry picked from commit ea1e0f4d7b0ac0d88a6c755f24910e239ac0c5f0)
---
pom.xml | 6 ++++++
pulsar-broker/pom.xml | 25 ++++++++++++++++++++++++-
pulsar-transaction/coordinator/pom.xml | 29 ++++++++++++++++++++++++++---
3 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e5456e0..005850e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,6 +227,7 @@ flexible messaging model and an intuitive client API.</description>
<maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
<maven-shade-plugin>3.2.4</maven-shade-plugin>
<maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
+ <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
<nifi-nar-maven-plugin.version>1.2.0</nifi-nar-maven-plugin.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
<git-commit-id-plugin.version>4.0.2</git-commit-id-plugin.version>
@@ -1692,6 +1693,11 @@ flexible messaging model and an intuitive client API.</description>
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>${properties-maven-plugin.version}</version>
+ </plugin>
</plugins>
</pluginManagement>
<extensions>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 18d420c..b596640 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -474,7 +474,30 @@
</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 1bd6a8b..f6c4112 100644
--- a/pulsar-transaction/coordinator/pom.xml
+++ b/pulsar-transaction/coordinator/pom.xml
@@ -57,7 +57,6 @@
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
- <version>${awaitility.version}</version>
<scope>test</scope>
</dependency>
@@ -65,8 +64,32 @@
<build>
<plugins>
- <plugin>
- <groupId>com.github.splunk.lightproto</groupId>
+ <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>
<version>${lightproto-maven-plugin.version}</version>
<executions>