From 350662b5ba64f574f8217ea46ec24598b4f4ea2c Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <klk@google.com>
Date: Wed, 19 Oct 2016 19:26:35 -0700
Subject: [PATCH 1/4] Fix typo and dependencies in beam-runners-direct-java

---
 pom.xml                     | 8 ++++++++
 runners/direct-java/pom.xml | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1263827d5fae7..c8559fbcb1ad2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -703,6 +703,14 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>org.apache.beam</groupId>
+        <artifactId>beam-runners-core-java</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-all</artifactId>
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 354c8c7798566..0b61ea41eb603 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -83,7 +83,7 @@
               <failIfNoTests>true</failIfNoTests>
               <dependenciesToScan>
                 <dependency>org.apache.beam:beam-sdks-java-core</dependency>
-                <dependency>org.apache.beam:beam-runners-java-core</dependency>
+                <dependency>org.apache.beam:beam-runners-core-java</dependency>
               </dependenciesToScan>
               <systemPropertyVariables>
                 <beamTestPipelineOptions>
@@ -340,6 +340,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>beam-runners-core-java</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+
     <!-- required for XMLSourceTest -->
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>

From 057611e7f8f8084a780b7ccb7c61bdcd73d39024 Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <klk@google.com>
Date: Thu, 20 Oct 2016 10:41:51 -0700
Subject: [PATCH 2/4] fixup! use classifier

---
 runners/direct-java/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 0b61ea41eb603..31f196c26fdf1 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -336,14 +336,14 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-sdks-java-core</artifactId>
-      <type>test-jar</type>
+      <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-runners-core-java</artifactId>
-      <type>test-jar</type>
+      <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
 

From b6ed8cd00f92fc453e56fe6c011ee5196c5174fd Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <klk@google.com>
Date: Thu, 20 Oct 2016 10:47:37 -0700
Subject: [PATCH 3/4] fixup! more test-jar wipeout

---
 pom.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index c8559fbcb1ad2..de4bd6392a50b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -687,14 +687,6 @@
 
       <!-- Testing -->
 
-      <dependency>
-        <groupId>org.apache.beam</groupId>
-        <artifactId>beam-sdks-java-core</artifactId>
-        <version>${project.version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.beam</groupId>
         <artifactId>beam-sdks-java-core</artifactId>
@@ -707,7 +699,7 @@
         <groupId>org.apache.beam</groupId>
         <artifactId>beam-runners-core-java</artifactId>
         <version>${project.version}</version>
-        <type>test-jar</type>
+        <classifier>tests</classifier>
         <scope>test</scope>
       </dependency>
 

From 24af77157d9574c849d905f3b2497ddb319b5164 Mon Sep 17 00:00:00 2001
From: Kenneth Knowles <klk@google.com>
Date: Thu, 20 Oct 2016 16:00:57 -0700
Subject: [PATCH 4/4] fixup! Dataflow runner pom

---
 runners/google-cloud-dataflow-java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index b035028aa964b..0f2d3b2ef58bd 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -402,7 +402,7 @@
     <dependency>
       <groupId>org.apache.beam</groupId>
       <artifactId>beam-sdks-java-core</artifactId>
-      <type>test-jar</type>
+      <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>