From 48193e6f3e028536b958472270e26d9c37ff496a Mon Sep 17 00:00:00 2001
From: Luke Cwik <lcwik@google.com>
Date: Wed, 19 Apr 2017 09:20:38 -0700
Subject: [PATCH] [BEAM-2015] Remove shared profile in runners/pom.xml and fix
 Dataflow ValidatesRunner PostCommit

---
 runners/apex/pom.xml                       |  1 +
 runners/direct-java/pom.xml                |  1 +
 runners/flink/pom.xml                      |  2 +
 runners/google-cloud-dataflow-java/pom.xml | 43 ++++++++++++++++++++++
 runners/pom.xml                            | 40 --------------------
 runners/spark/pom.xml                      |  1 +
 6 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/runners/apex/pom.xml b/runners/apex/pom.xml
index 40fc93c92528..f441e3d3217b 100644
--- a/runners/apex/pom.xml
+++ b/runners/apex/pom.xml
@@ -229,6 +229,7 @@
                 </beamTestPipelineOptions>
               </systemPropertyVariables>
               <skipTests>${skipIntegrationTests}</skipTests>
+              <threadCount>4</threadCount>
             </configuration>
           </execution>
         </executions>
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 03ed79167fc1..fc28fd6ea667 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -81,6 +81,7 @@
                   ]
                 </beamTestPipelineOptions>
               </systemPropertyVariables>
+              <threadCount>4</threadCount>
             </configuration>
           </execution>
         </executions>
diff --git a/runners/flink/pom.xml b/runners/flink/pom.xml
index 351035ec7534..808219b74573 100644
--- a/runners/flink/pom.xml
+++ b/runners/flink/pom.xml
@@ -75,6 +75,7 @@
                       ]
                     </beamTestPipelineOptions>
                   </systemPropertyVariables>
+                  <threadCount>4</threadCount>
                 </configuration>
               </execution>
 
@@ -108,6 +109,7 @@
                       ]
                     </beamTestPipelineOptions>
                   </systemPropertyVariables>
+                  <threadCount>4</threadCount>
                 </configuration>
               </execution>
             </executions>
diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index e8aadb8de406..4cde92352bbb 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -38,6 +38,49 @@
     <dataflow.legacy_environment_major_version>6</dataflow.legacy_environment_major_version>
   </properties>
 
+  <profiles>
+    <!-- A profile that adds an integration test phase if and only if
+     the validatesRunnerPipelineOptions maven property has been set.
+     It should be set to a valid PipelineOptions JSON string. -->
+    <profile>
+      <id>validates-runner-tests</id>
+      <activation>
+        <property><name>validatesRunnerPipelineOptions</name></property>
+      </activation>
+      <build>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <executions>
+                <execution>
+                  <id>validates-runner-tests</id>
+                  <phase>integration-test</phase>
+                  <goals>
+                    <goal>test</goal>
+                  </goals>
+                  <configuration>
+                    <skip>false</skip>
+                    <groups>org.apache.beam.sdk.testing.ValidatesRunner</groups>
+                    <parallel>all</parallel>
+                    <threadCount>4</threadCount>
+                    <dependenciesToScan>
+                      <dependency>org.apache.beam:beam-sdks-java-core</dependency>
+                    </dependenciesToScan>
+                    <systemPropertyVariables>
+                      <beamTestPipelineOptions>${validatesRunnerPipelineOptions}</beamTestPipelineOptions>
+                    </systemPropertyVariables>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </pluginManagement>
+      </build>
+    </profile>
+  </profiles>
+
   <build>
     <resources>
       <resource>
diff --git a/runners/pom.xml b/runners/pom.xml
index 150e987aecdf..8f3cabdad123 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -54,46 +54,6 @@
         </plugins>
       </build>
     </profile>
-
-    <!-- A profile that adds an integration test phase if and only if
-         the validatesRunnerPipelineOptions maven property has been set.
-         It should be set to a valid PipelineOptions JSON string. -->
-    <profile>
-      <id>validates-runner-tests</id>
-      <activation>
-        <property><name>validatesRunnerPipelineOptions</name></property>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>validates-runner-tests</id>
-                  <phase>integration-test</phase>
-                  <goals>
-                    <goal>test</goal>
-                  </goals>
-                  <configuration>
-                    <groups>org.apache.beam.sdk.testing.ValidatesRunner</groups>
-                    <parallel>all</parallel>
-                    <threadCount>4</threadCount>
-                    <dependenciesToScan>
-                      <dependency>org.apache.beam:beam-sdks-java-core</dependency>
-                    </dependenciesToScan>
-                    <systemPropertyVariables>
-                      <beamTestPipelineOptions>${validatesRunnerPipelineOptions}</beamTestPipelineOptions>
-                    </systemPropertyVariables>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
   </profiles>
 
   <build>
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 74934858fed2..55788e67317f 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -102,6 +102,7 @@
                     <spark.ui.enabled>false</spark.ui.enabled>
                     <spark.ui.showConsoleProgress>false</spark.ui.showConsoleProgress>
                   </systemPropertyVariables>
+                  <threadCount>4</threadCount>
                 </configuration>
               </execution>
             </executions>