From 60d5471f74df1da5979dc31a6a7ee11c6fe1a850 Mon Sep 17 00:00:00 2001
From: Luke Cwik <lcwik@google.com>
Date: Tue, 12 Apr 2016 17:49:07 -0700
Subject: [PATCH 1/3] [BEAM-151] Add support for RunnableOnService validation
 tests to runners package

Default implementation for Flink and Spark are to have it disabled.
Default implementation for Dataflow requires you to specify the runnableOnServicePipelineOptions
system property with a valid project/runner/... to be able to execute on Google Cloud Dataflow.
---
 examples/java/pom.xml                         | 11 -----
 examples/java8/pom.xml                        | 11 -----
 pom.xml                                       |  7 ---
 runners/google-cloud-dataflow-java/pom.xml    | 49 ++++++++++++-------
 runners/pom.xml                               | 38 ++++++++++++++
 sdks/java/core/pom.xml                        | 16 ------
 .../sdk/testing/RunnableOnService.java        | 13 +++--
 .../dataflow/sdk/testing/TestPipeline.java    | 25 +++++-----
 .../sdk/testing/DataflowJUnitTestRunner.java  |  5 +-
 .../sdk/testing/TestPipelineTest.java         |  5 +-
 sdks/java/java8tests/pom.xml                  | 15 ------
 11 files changed, 91 insertions(+), 104 deletions(-)

diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index a90973af742e..bcac57d1f94d 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -36,17 +36,6 @@
 
   <packaging>jar</packaging>
 
-  <profiles>
-    <profile>
-      <id>DataflowPipelineTests</id>
-      <properties>
-        <runIntegrationTestOnService>true</runIntegrationTestOnService>
-        <testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
-        <testParallelValue>both</testParallelValue>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>
diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml
index 822341b0d69f..fe10dbc0eeda 100644
--- a/examples/java8/pom.xml
+++ b/examples/java8/pom.xml
@@ -37,17 +37,6 @@
 
   <packaging>jar</packaging>
 
-  <profiles>
-    <profile>
-      <id>DataflowPipelineTests</id>
-      <properties>
-        <runIntegrationTestOnService>true</runIntegrationTestOnService>
-        <testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
-        <testParallelValue>both</testParallelValue>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <plugins>
       <plugin>
diff --git a/pom.xml b/pom.xml
index 08073a229a12..de29eb8153fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,13 +289,6 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.18.1</version>
           <configuration>
-            <parallel>${testParallelValue}</parallel>
-            <threadCount>4</threadCount>
-            <groups>${testGroups}</groups>
-            <systemPropertyVariables>
-              <runIntegrationTestOnService>${runIntegrationTestOnService}</runIntegrationTestOnService>
-              <projectName>${dataflowProjectName}</projectName>
-            </systemPropertyVariables>
             <useManifestOnlyJar>false</useManifestOnlyJar>
             <trimStackTrace>false</trimStackTrace>
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index 3d62b0ef7323..715e35990aaf 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -21,14 +21,11 @@
 
   <modelVersion>4.0.0</modelVersion>
 
-  <!-- We use the Beam parent to allow for runners/flink, examples/java and
-       sdks/java/maven-archetypes to depend on the Dataflow runner. This is
-       until those modules can migrate off of the Dataflow runner classes. -->
   <parent>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>parent</artifactId>
-      <version>0.1.0-incubating-SNAPSHOT</version>
-      <relativePath>../../pom.xml</relativePath>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>runners-parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>google-cloud-dataflow-java-runner</artifactId>
@@ -41,21 +38,37 @@
     <beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-    <dataflow>com.google.cloud.dataflow</dataflow>
-    <runIntegrationTestOnService>false</runIntegrationTestOnService>
-    <testParallelValue>none</testParallelValue>
-    <testGroups></testGroups>
-    <dataflowProjectName></dataflowProjectName>
   </properties>
 
+  <!-- Disable integration tests unless told explicitly a set of test flags. -->
   <profiles>
     <profile>
-      <id>DataflowPipelineTests</id>
-      <properties>
-        <runIntegrationTestOnService>true</runIntegrationTestOnService>
-        <testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
-        <testParallelValue>both</testParallelValue>
-      </properties>
+      <id>disable-integration-tests</id>
+      <activation>
+        <property>
+          <name>!integrationTestPipelineOptions</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>disable-integration-test</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <configuration>
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
     </profile>
   </profiles>
 
diff --git a/runners/pom.xml b/runners/pom.xml
index cba25a3a1256..013881f91edc 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -39,4 +39,42 @@
     <module>spark</module>
   </modules>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.18.1</version>
+          <executions>
+            <execution>
+              <id>execute-integration-tests</id>
+              <phase>integration-test</phase>
+              <goals>
+                <goal>test</goal>
+              </goals>
+              <configuration>
+                <groups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</groups>
+                <parallel>all</parallel>
+                <threadCount>4</threadCount>
+                <dependenciesToScan>
+                  <dependency>org.apache.beam:java-sdk-all</dependency>
+                </dependenciesToScan>
+                <systemPropertyVariables>
+                  <beamTestPipelineOptions>${integrationTestPipelineOptions}</beamTestPipelineOptions>
+                </systemPropertyVariables>
+              </configuration>
+            </execution>
+          </executions>
+          <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit47</artifactId>
+            <version>2.18.1</version>
+          </dependency>
+        </dependencies>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml
index aa72b11c667f..06ceb2286b1c 100644
--- a/sdks/java/core/pom.xml
+++ b/sdks/java/core/pom.xml
@@ -39,24 +39,8 @@
   <properties>
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-    <dataflow>com.google.cloud.dataflow</dataflow>
-    <runIntegrationTestOnService>false</runIntegrationTestOnService>
-    <testParallelValue>none</testParallelValue>
-    <testGroups></testGroups>
-    <dataflowProjectName></dataflowProjectName>
   </properties>
 
-  <profiles>
-    <profile>
-      <id>DataflowPipelineTests</id>
-      <properties>
-        <runIntegrationTestOnService>true</runIntegrationTestOnService>
-        <testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
-        <testParallelValue>both</testParallelValue>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
     <resources>
       <resource>
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java
index 4490c3c79f8c..ea14774e9d97 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/RunnableOnService.java
@@ -18,14 +18,17 @@
 package com.google.cloud.dataflow.sdk.testing;
 
 /**
- * Category tag for tests that can be run on the
- * {@link com.google.cloud.dataflow.sdk.runners.DataflowPipelineRunner} if the
- * {@code runIntegrationTestOnService} System property is set to true.
- * Example usage:
+ * Category tag for validation tests which utilize {@link TestPipeline} for execution and
+ * {@link PAssert} for validation. Example usage:
  * <pre><code>
  *     {@literal @}Test
  *     {@literal @}Category(RunnableOnService.class)
- *     public void testParDo() {...
+ *     public void testParDo() {
+ *       Pipeline p = TestPipeline.create();
+ *       p.apply(...);
+ *       PAssert.that(p);
+ *       p.run();
+ *     }
  * </code></pre>
  */
 public interface RunnableOnService {}
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
index fe667a44feae..f2ca2577aa63 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
@@ -27,6 +27,7 @@
 import com.google.cloud.dataflow.sdk.runners.PipelineRunner;
 import com.google.cloud.dataflow.sdk.util.TestCredential;
 import com.google.common.base.Optional;
+import com.google.common.base.Strings;
 import com.google.common.collect.Iterators;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -49,7 +50,6 @@
  *
  * <p>In order to run tests on a pipeline runner, the following conditions must be met:
  * <ul>
- *   <li>System property "runIntegrationTestOnService" must be set to true.</li>
  *   <li>System property "dataflowOptions" must contain a JSON delimited list of pipeline options.
  *   For example:
  *   <pre>{@code [
@@ -77,7 +77,7 @@
  * containing the message from the {@link PAssert} that failed.
  */
 public class TestPipeline extends Pipeline {
-  private static final String PROPERTY_DATAFLOW_OPTIONS = "dataflowOptions";
+  private static final String PROPERTY_BEAM_TEST_PIPELINE_OPTIONS = "beamTestPipelineOptions";
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
   /**
@@ -126,34 +126,31 @@ public String toString() {
    */
   public static PipelineOptions testingPipelineOptions() {
     try {
-      @Nullable String systemDataflowOptions = System.getProperty(PROPERTY_DATAFLOW_OPTIONS);
+      @Nullable String beamTestPipelineOptions =
+          System.getProperty(PROPERTY_BEAM_TEST_PIPELINE_OPTIONS);
+
       PipelineOptions options =
-          systemDataflowOptions == null
+          Strings.isNullOrEmpty(beamTestPipelineOptions)
               ? PipelineOptionsFactory.create()
               : PipelineOptionsFactory.fromArgs(
                       MAPPER.readValue(
-                          System.getProperty(PROPERTY_DATAFLOW_OPTIONS), String[].class))
+                          System.getProperty(PROPERTY_BEAM_TEST_PIPELINE_OPTIONS), String[].class))
                   .as(PipelineOptions.class);
 
       options.as(ApplicationNameOptions.class).setAppName(getAppName());
-      if (!isIntegrationTest()) {
+      // If no options were specified, use a test credential object on all pipelines.
+      if (Strings.isNullOrEmpty(beamTestPipelineOptions)) {
         options.as(GcpOptions.class).setGcpCredential(new TestCredential());
       }
       options.setStableUniqueNames(CheckEnabled.ERROR);
       return options;
     } catch (IOException e) {
       throw new RuntimeException("Unable to instantiate test options from system property "
-          + PROPERTY_DATAFLOW_OPTIONS + ":" + System.getProperty(PROPERTY_DATAFLOW_OPTIONS), e);
+          + PROPERTY_BEAM_TEST_PIPELINE_OPTIONS + ":"
+          + System.getProperty(PROPERTY_BEAM_TEST_PIPELINE_OPTIONS), e);
     }
   }
 
-  /**
-   * Returns whether a {@link TestPipeline} should be treated as an integration test.
-   */
-  private static boolean isIntegrationTest() {
-    return Boolean.parseBoolean(System.getProperty("runIntegrationTestOnService"));
-  }
-
   /** Returns the class + method name of the test, or a default name. */
   private static String getAppName() {
     Optional<StackTraceElement> stackTraceElement = findCallersStackTrace();
diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java
index ffb71c09781a..f0f341a2959a 100644
--- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java
+++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/DataflowJUnitTestRunner.java
@@ -94,9 +94,8 @@ public static void main(String ... args) throws Exception {
 
     // Set system properties required by TestPipeline so that it is able to execute tests
     // on the service.
-    String dataflowPipelineOptions = new ObjectMapper().writeValueAsString(args);
-    System.setProperty("runIntegrationTestOnService", "true");
-    System.setProperty("dataflowOptions", dataflowPipelineOptions);
+    String beamTestPipelineOptions = new ObjectMapper().writeValueAsString(args);
+    System.setProperty("beamTestPipelineOptions", beamTestPipelineOptions);
 
     // Run the set of tests
     boolean success = true;
diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java
index d6a2b63a6a4b..147cc490b209 100644
--- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java
+++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java
@@ -52,7 +52,7 @@ public void testCreationOfPipelineOptions() throws Exception {
       "--runner=DirectPipelineRunner",
       "--project=testProject"
     });
-    System.getProperties().put("dataflowOptions", stringOptions);
+    System.getProperties().put("beamTestPipelineOptions", stringOptions);
     GcpOptions options =
         TestPipeline.testingPipelineOptions().as(GcpOptions.class);
     assertEquals(DirectPipelineRunner.class, options.getRunner());
@@ -61,9 +61,6 @@ public void testCreationOfPipelineOptions() throws Exception {
 
   @Test
   public void testCreationOfPipelineOptionsFromReallyVerboselyNamedTestCase() throws Exception {
-        ObjectMapper mapper = new ObjectMapper();
-    String stringOptions = mapper.writeValueAsString(new String[]{});
-    System.getProperties().put("dataflowOptions", stringOptions);
     PipelineOptions options = TestPipeline.testingPipelineOptions();
     assertThat(options.as(ApplicationNameOptions.class).getAppName(), startsWith(
         "TestPipelineTest-testCreationOfPipelineOptionsFromReallyVerboselyNamedTestCase"));
diff --git a/sdks/java/java8tests/pom.xml b/sdks/java/java8tests/pom.xml
index 59e2843119fd..cd7174a729fa 100644
--- a/sdks/java/java8tests/pom.xml
+++ b/sdks/java/java8tests/pom.xml
@@ -37,22 +37,9 @@
 
   <packaging>jar</packaging>
 
-  <profiles>
-    <profile>
-      <id>DataflowPipelineTests</id>
-      <properties>
-        <runIntegrationTestOnService>true</runIntegrationTestOnService>
-        <testGroups>com.google.cloud.dataflow.sdk.testing.RunnableOnService</testGroups>
-        <testParallelValue>both</testParallelValue>
-      </properties>
-    </profile>
-  </profiles>
-
   <build>
-
     <pluginManagement>
       <plugins>
-
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
@@ -60,12 +47,10 @@
              <target>1.8</target>
           </configuration>
         </plugin>
-
       </plugins>
     </pluginManagement>
 
     <plugins>
-
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>

From 86e61c5f91f02340b42e3608b0b949f6384ae3d9 Mon Sep 17 00:00:00 2001
From: Luke Cwik <lcwik@google.com>
Date: Tue, 12 Apr 2016 19:50:49 -0700
Subject: [PATCH 2/3] [BEAM-151] !fixup Add the runnable-on-service-tests
 execution

---
 runners/flink/examples/pom.xml             |  25 +
 runners/flink/runner/pom.xml               |  24 +
 runners/google-cloud-dataflow-java/pom.xml |  14 +-
 runners/pom.xml                            |  11 +-
 runners/spark/pom.xml                      | 783 +++++++++++----------
 5 files changed, 461 insertions(+), 396 deletions(-)

diff --git a/runners/flink/examples/pom.xml b/runners/flink/examples/pom.xml
index 1c0a4dd5aa7b..d27f2db2f361 100644
--- a/runners/flink/examples/pom.xml
+++ b/runners/flink/examples/pom.xml
@@ -42,6 +42,31 @@
     <parallelism>1</parallelism>
   </properties>
 
+  <profiles>
+    <profile>
+      <id>disable-runnable-on-service-tests</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>runnable-on-service-tests</id>
+                <configuration>
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
   <dependencies>
 
     <dependency>
diff --git a/runners/flink/runner/pom.xml b/runners/flink/runner/pom.xml
index 7a1011a8e88d..89c8d9949e66 100644
--- a/runners/flink/runner/pom.xml
+++ b/runners/flink/runner/pom.xml
@@ -34,6 +34,30 @@
 
   <packaging>jar</packaging>
 
+  <profiles>
+    <profile>
+      <id>disable-runnable-on-service-tests</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>runnable-on-service-tests</id>
+                <configuration>
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 
   <dependencies>
     <!-- Flink dependencies -->
diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index 715e35990aaf..e54bbf95bb3f 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -40,13 +40,15 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
   </properties>
 
-  <!-- Disable integration tests unless told explicitly a set of test flags. -->
+  <!-- Disable integration tests unless told configured by a test flag.
+       This allows users by default to opt-out of running Dataflow integration
+       tests because of the requirements to have a valid GCP project and so forth. -->
   <profiles>
     <profile>
-      <id>disable-integration-tests</id>
+      <id>disable-runnable-on-service-tests</id>
       <activation>
         <property>
-          <name>!integrationTestPipelineOptions</name>
+          <name>!runnableOnServicePipelineOptions</name>
         </property>
       </activation>
       <build>
@@ -56,11 +58,7 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <executions>
               <execution>
-                <id>disable-integration-test</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
+                <id>runnable-on-service-tests</id>
                 <configuration>
                   <skip>true</skip>
                 </configuration>
diff --git a/runners/pom.xml b/runners/pom.xml
index 013881f91edc..9e2eb4305c69 100644
--- a/runners/pom.xml
+++ b/runners/pom.xml
@@ -48,7 +48,7 @@
           <version>2.18.1</version>
           <executions>
             <execution>
-              <id>execute-integration-tests</id>
+              <id>runnable-on-service-tests</id>
               <phase>integration-test</phase>
               <goals>
                 <goal>test</goal>
@@ -61,18 +61,11 @@
                   <dependency>org.apache.beam:java-sdk-all</dependency>
                 </dependenciesToScan>
                 <systemPropertyVariables>
-                  <beamTestPipelineOptions>${integrationTestPipelineOptions}</beamTestPipelineOptions>
+                  <beamTestPipelineOptions>${runnableOnServicePipelineOptions}</beamTestPipelineOptions>
                 </systemPropertyVariables>
               </configuration>
             </execution>
           </executions>
-          <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.surefire</groupId>
-            <artifactId>surefire-junit47</artifactId>
-            <version>2.18.1</version>
-          </dependency>
-        </dependencies>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/runners/spark/pom.xml b/runners/spark/pom.xml
index 477691023a13..f12d8a6a3c17 100644
--- a/runners/spark/pom.xml
+++ b/runners/spark/pom.xml
@@ -19,396 +19,421 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.beam</groupId>
-        <artifactId>runners-parent</artifactId>
-        <version>0.1.0-incubating-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.apache.beam</groupId>
+    <artifactId>runners-parent</artifactId>
+    <version>0.1.0-incubating-SNAPSHOT</version>
+  </parent>
 
-    <artifactId>spark-runner</artifactId>
+  <artifactId>spark-runner</artifactId>
 
-    <name>Apache Beam :: Runners :: Spark</name>
-    <packaging>jar</packaging>
+  <name>Apache Beam :: Runners :: Spark</name>
+  <packaging>jar</packaging>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.7</java.version>
-        <spark.version>1.6.1</spark.version>
-        <beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
-    </properties>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <java.version>1.7</java.version>
+    <spark.version>1.6.1</spark.version>
+    <beam.version>0.1.0-incubating-SNAPSHOT</beam.version>
+  </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-core_2.10</artifactId>
-            <version>${spark.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-streaming_2.10</artifactId>
-            <version>${spark.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.spark</groupId>
-            <artifactId>spark-streaming-kafka_2.10</artifactId>
-            <version>${spark.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka_2.10</artifactId>
-            <version>0.8.2.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.beam</groupId>
-            <artifactId>java-sdk-all</artifactId>
-            <version>${beam.version}</version>
-            <exclusions>
-                <!-- Use Hadoop/Spark's backend logger -->
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-jdk14</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.beam</groupId>
-            <artifactId>java-examples-all</artifactId>
-            <version>${beam.version}</version>
-            <exclusions>
-                <!-- Use Hadoop/Spark's backend logger -->
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-jdk14</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.avro</groupId>
-            <artifactId>avro-mapred</artifactId>
-            <version>1.7.7</version>
-            <classifier>hadoop2</classifier>
-            <exclusions>
-                <!-- exclude old Jetty version of servlet API -->
-                <exclusion>
-                    <groupId>org.mortbay.jetty</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-core_2.10</artifactId>
+      <version>${spark.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-streaming_2.10</artifactId>
+      <version>${spark.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.spark</groupId>
+      <artifactId>spark-streaming-kafka_2.10</artifactId>
+      <version>${spark.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.kafka</groupId>
+      <artifactId>kafka_2.10</artifactId>
+      <version>0.8.2.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>${guava.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-sdk-all</artifactId>
+      <version>${beam.version}</version>
+      <exclusions>
+        <!-- Use Hadoop/Spark's backend logger -->
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-jdk14</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>java-examples-all</artifactId>
+      <version>${beam.version}</version>
+      <exclusions>
+        <!-- Use Hadoop/Spark's backend logger -->
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-jdk14</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro-mapred</artifactId>
+      <version>1.7.7</version>
+      <classifier>hadoop2</classifier>
+      <exclusions>
+        <!-- exclude old Jetty version of servlet API -->
+        <exclusion>
+          <groupId>org.mortbay.jetty</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
 
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+    <!-- test dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.5</version>
-                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                        <compilerArgs>
-                            <arg>-Xlint:all,-serial</arg>
-                        </compilerArgs>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.19.1</version>
-                    <configuration>
-                        <forkCount>1</forkCount>
-                        <reuseForks>false</reuseForks>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.17</version>
-                    <configuration>
-                        <headerLocation>build-resources/header-file.txt</headerLocation>
-                        <configLocation>build-resources/checkstyle.xml</configLocation>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>validate</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-source-plugin</artifactId>
-                    <version>2.4</version>
-                    <executions>
-                        <execution>
-                            <id>attach-sources</id>
-                            <goals>
-                                <goal>jar-no-fork</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.10.3</version>
-                    <configuration>
-                        <javadocVersion>${java.version}</javadocVersion>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>attach-javadocs</id>
-                            <goals>
-                                <goal>jar</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
-                    <configuration>
-                        <createChecksum>true</createChecksum>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.7</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.6</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.4</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.maven.scm</groupId>
-                            <artifactId>maven-scm-provider-gitexe</artifactId>
-                            <version>1.9.2</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.6</version>
-                    <executions>
-                        <execution>
-                            <id>sign-artifacts</id>
-                            <phase>verify</phase>
-                            <goals>
-                              <goal>sign</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.rat</groupId>
-                    <artifactId>apache-rat-plugin</artifactId>
-                    <version>0.11</version>
-                    <configuration>
-                        <excludes>
-                            <exclude>.travis.yml</exclude>
-                            <exclude>**/*.conf</exclude>
-                            <exclude>**/*.iml</exclude>
-                            <exclude>**/*.md</exclude>
-                            <exclude>**/*.txt</exclude>
-                            <exclude>**/.project</exclude>
-                            <exclude>**/.checkstyle</exclude>
-                            <exclude>**/.classpath</exclude>
-                            <exclude>**/.settings/</exclude>
-                            <exclude>**/gen/**</exclude>
-                            <exclude>**/resources/**</exclude>
-                            <exclude>**/target/**</exclude>
-                            <exclude>**/dependency-reduced-pom.xml</exclude>
-                            <excludeSubProjects>false</excludeSubProjects>
-                        </excludes>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>verify</id>
-                            <phase>verify</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.4.0</version>
-                    <configuration>
-                        <executable>java</executable>
-                        <classpathScope>test</classpathScope> <!-- include provided deps -->
-                        <arguments>
-                            <argument>-classpath</argument>
-                            <classpath />
-                            <argument>${mainClass}</argument>
-                            <argument>--inputFile=${input}</argument>
-                            <argument>--output=${output}</argument>
-                            <argument>--runner=${runner}</argument>
-                            <argument>--sparkMaster=${sparkMaster}</argument>
-                        </arguments>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.7.5.201505241946</version>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                        </execution>
-                        <execution>
-                            <id>report</id>
-                            <phase>test</phase>
-                            <goals>
-                               <goal>report</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.4.3</version>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>shade</goal>
-                            </goals>
-                            <configuration>
-                                <relocations>
-                                    <!-- relocate Guava used by Dataflow (v18) since it conflicts with version used by Hadoop (v11) -->
-                                    <relocation>
-                                        <pattern>com.google.common</pattern>
-                                        <shadedPattern>org.apache.beam.spark.relocated.com.google.common</shadedPattern>
-                                    </relocation>
-                                </relocations>
-                                <shadedArtifactAttached>true</shadedArtifactAttached>
-                                <shadedClassifierName>spark-app</shadedClassifierName>
-                                <transformers>
-                                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                                </transformers>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.5</version>
+          <configuration>
+            <source>${java.version}</source>
+            <target>${java.version}</target>
+            <compilerArgs>
+              <arg>-Xlint:all,-serial</arg>
+            </compilerArgs>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.19.1</version>
+          <configuration>
+            <forkCount>1</forkCount>
+            <reuseForks>false</reuseForks>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.17</version>
+          <configuration>
+            <headerLocation>build-resources/header-file.txt</headerLocation>
+            <configLocation>build-resources/checkstyle.xml</configLocation>
+          </configuration>
+          <executions>
+            <execution>
+              <id>validate</id>
+              <phase>validate</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.4</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.10.3</version>
+          <configuration>
+            <javadocVersion>${java.version}</javadocVersion>
+          </configuration>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>3.0.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-deploy-plugin</artifactId>
+          <version>2.8.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.5.2</version>
+          <configuration>
+            <createChecksum>true</createChecksum>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.7</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.6</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.5.3</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.scm</groupId>
+              <artifactId>maven-scm-provider-gitexe</artifactId>
+              <version>1.9.2</version>
+            </dependency>
+          </dependencies>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-gpg-plugin</artifactId>
+          <version>1.6</version>
+          <executions>
+            <execution>
+              <id>sign-artifacts</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>sign</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.rat</groupId>
+          <artifactId>apache-rat-plugin</artifactId>
+          <version>0.11</version>
+          <configuration>
+            <excludes>
+              <exclude>.travis.yml</exclude>
+              <exclude>**/*.conf</exclude>
+              <exclude>**/*.iml</exclude>
+              <exclude>**/*.md</exclude>
+              <exclude>**/*.txt</exclude>
+              <exclude>**/.project</exclude>
+              <exclude>**/.checkstyle</exclude>
+              <exclude>**/.classpath</exclude>
+              <exclude>**/.settings/</exclude>
+              <exclude>**/gen/**</exclude>
+              <exclude>**/resources/**</exclude>
+              <exclude>**/target/**</exclude>
+              <exclude>**/dependency-reduced-pom.xml</exclude>
+              <excludeSubProjects>false</excludeSubProjects>
+            </excludes>
+          </configuration>
+          <executions>
+            <execution>
+              <id>verify</id>
+              <phase>verify</phase>
+              <goals>
+                <goal>check</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.4.0</version>
+          <configuration>
+            <executable>java</executable>
+            <classpathScope>test</classpathScope> <!-- include provided deps -->
+            <arguments>
+              <argument>-classpath</argument>
+              <classpath />
+              <argument>${mainClass}</argument>
+              <argument>--inputFile=${input}</argument>
+              <argument>--output=${output}</argument>
+              <argument>--runner=${runner}</argument>
+              <argument>--sparkMaster=${sparkMaster}</argument>
+            </arguments>
+          </configuration>
+        </plugin>
+        <plugin>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <version>0.7.5.201505241946</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>prepare-agent</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>report</id>
+              <phase>test</phase>
+              <goals>
+                <goal>report</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>2.4.3</version>
+          <executions>
+            <execution>
+              <phase>package</phase>
+              <goals>
+                <goal>shade</goal>
+              </goals>
+              <configuration>
+                <relocations>
+                  <!-- relocate Guava used by Dataflow (v18) since it conflicts with 
+                    version used by Hadoop (v11) -->
+                  <relocation>
+                    <pattern>com.google.common</pattern>
+                    <shadedPattern>org.apache.beam.spark.relocated.com.google.common</shadedPattern>
+                  </relocation>
+                </relocations>
+                <shadedArtifactAttached>true</shadedArtifactAttached>
+                <shadedClassifierName>spark-app</shadedClassifierName>
+                <transformers>
+                  <transformer
+                    implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+                </transformers>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-checkstyle-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <id>aggregate</id>
+            <reports>
+              <report>aggregate</report>
+              <report>test-aggregate</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>jacoco</id>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-              <artifactId>apache-rat-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-            </plugin>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+          </plugin>
         </plugins>
-    </build>
+      </build>
+    </profile>
 
-    <reporting>
+    <profile>
+      <id>disable-runnable-on-service-tests</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <reportSets>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <reports>
-                            <report>aggregate</report>
-                            <report>test-aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>runnable-on-service-tests</id>
+                <configuration>
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
         </plugins>
-    </reporting>
-
-    <profiles>
-        <profile>
-            <id>jacoco</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+  </profiles>
 
 </project>

From c1b4f3350b830f726e169999cfe6db0d6b337022 Mon Sep 17 00:00:00 2001
From: Luke Cwik <lcwik@google.com>
Date: Tue, 12 Apr 2016 19:54:45 -0700
Subject: [PATCH 3/3] [BEAM-151] !fixup Fix comment in TestPipeline

---
 .../com/google/cloud/dataflow/sdk/testing/TestPipeline.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
index f2ca2577aa63..17b1538a9bbf 100644
--- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
+++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/testing/TestPipeline.java
@@ -50,8 +50,8 @@
  *
  * <p>In order to run tests on a pipeline runner, the following conditions must be met:
  * <ul>
- *   <li>System property "dataflowOptions" must contain a JSON delimited list of pipeline options.
- *   For example:
+ *   <li>System property "beamTestPipelineOptions" must contain a JSON delimited list of pipeline
+ *   options. For example:
  *   <pre>{@code [
  *     "--runner=com.google.cloud.dataflow.sdk.testing.TestDataflowPipelineRunner",
  *     "--project=mygcpproject",