[GitHub] sijie closed pull request #1447: Include stream modules in bookkeeper distributions only when `-Dstream` is specified

[GitBox <gi...@apache.org>]

sijie closed pull request #1447: Include stream modules in bookkeeper distributions only when `-Dstream` is specified
URL: https://github.com/apache/bookkeeper/pull/1447
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/bookkeeper-dist/all/pom.xml b/bookkeeper-dist/all/pom.xml
index eb69948e6..3520b32e7 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 7b00dbeaf..06e373817 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 dcc20acc1..88e597ab6 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>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services