This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new ed895a1 Include stream modules in bookkeeper distributions only when
`-Dstream` is specified
ed895a1 is described below
commit ed895a160444cb1866467d25148b16b6629991ce
Author: Sijie Guo <[email protected]>
AuthorDate: Sun May 27 22:57:22 2018 -0700
Include stream modules in bookkeeper distributions only when `-Dstream` is
specified
Descriptions of the changes in this PR:
*Motivation*
stream modules are only built when `-Dstream` is specified. so if we want
to include
binary distribution, `-Dstream` is needed. This updates those modules with
profiles
that enabled when `-Dstream` is specified.
Author: Sijie Guo <[email protected]>
Reviewers: Enrico Olivelli <[email protected]>
This closes #1447 from sijie/fix_stream_module
---
bookkeeper-dist/all/pom.xml | 25 ++++++++++++++++++-------
bookkeeper-dist/server/pom.xml | 25 ++++++++++++++++++-------
tests/integration/pom.xml | 15 ++++++++++++++-
3 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml
index eb69948..3520b32 100644
--- a/bookkeeper-dist/all/pom.xml
+++ b/bookkeeper-dist/all/pom.xml
@@ -92,13 +92,6 @@
<version>${project.version}</version>
</dependency>
- <!-- stream.storage -->
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>stream-storage-server</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- bookkeeper benchmark -->
<dependency>
<groupId>org.apache.bookkeeper</groupId>
@@ -152,4 +145,22 @@
</plugin>
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>stream</id>
+ <activation>
+ <property>
+ <name>stream</name>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- stream.storage -->
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>stream-storage-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/bookkeeper-dist/server/pom.xml b/bookkeeper-dist/server/pom.xml
index 7b00dbe..06e3738 100644
--- a/bookkeeper-dist/server/pom.xml
+++ b/bookkeeper-dist/server/pom.xml
@@ -76,13 +76,6 @@
<version>${project.version}</version>
</dependency>
- <!-- stream.storage -->
- <dependency>
- <groupId>org.apache.bookkeeper</groupId>
- <artifactId>stream-storage-server</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- slf4j binding -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -130,4 +123,22 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>stream</id>
+ <activation>
+ <property>
+ <name>stream</name>
+ </property>
+ </activation>
+ <dependencies>
+ <!-- stream.storage -->
+ <dependency>
+ <groupId>org.apache.bookkeeper</groupId>
+ <artifactId>stream-storage-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
</project>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index dcc20ac..88e597a 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -30,7 +30,6 @@
<modules>
<module>smoke</module>
<module>standalone</module>
- <module>cluster</module>
</modules>
<build>
@@ -70,5 +69,19 @@
</plugins>
</build>
</profile>
+
+ <!-- enable building table service related tests only when -Dstream is
provided -->
+ <profile>
+ <id>stream</id>
+ <activation>
+ <property>
+ <name>stream</name>
+ </property>
+ </activation>
+ <modules>
+ <!-- enable cluster testing -->
+ <module>cluster</module>
+ </modules>
+ </profile>
</profiles>
</project>
--
To stop receiving notification emails like this one, please contact
[email protected].
