You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ie...@apache.org on 2017/04/11 15:20:58 UTC

[1/2] beam git commit: Flip dependency edge between Dataflow runner and IO-GCP

Repository: beam
Updated Branches:
  refs/heads/master c46b256d7 -> 986fcefca


Flip dependency edge between Dataflow runner and IO-GCP

This will stop integration tests from running.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/17733e37
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/17733e37
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/17733e37

Branch: refs/heads/master
Commit: 17733e375ec057678d947076e2e83d955d8f8440
Parents: c46b256
Author: Dan Halperin <dh...@google.com>
Authored: Tue Apr 11 05:59:25 2017 -0700
Committer: Isma�l Mej�a <ie...@apache.org>
Committed: Tue Apr 11 17:16:25 2017 +0200

----------------------------------------------------------------------
 runners/google-cloud-dataflow-java/pom.xml |  6 +++++
 sdks/java/io/google-cloud-platform/pom.xml | 31 -------------------------
 2 files changed, 6 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/17733e37/runners/google-cloud-dataflow-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/pom.xml b/runners/google-cloud-dataflow-java/pom.xml
index 05ae8bc..d0d86e6 100644
--- a/runners/google-cloud-dataflow-java/pom.xml
+++ b/runners/google-cloud-dataflow-java/pom.xml
@@ -182,6 +182,12 @@
     </dependency>
 
     <dependency>
+      <groupId>org.apache.beam</groupId>
+      <artifactId>beam-sdks-java-io-google-cloud-platform</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
     </dependency>

http://git-wip-us.apache.org/repos/asf/beam/blob/17733e37/sdks/java/io/google-cloud-platform/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml
index a5b2e56..1a2e100 100644
--- a/sdks/java/io/google-cloud-platform/pom.xml
+++ b/sdks/java/io/google-cloud-platform/pom.xml
@@ -57,30 +57,6 @@
           </execution>
         </executions>
       </plugin>
-
-      <!-- Integration Tests -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <configuration>
-          <useManifestOnlyJar>false</useManifestOnlyJar>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-            <configuration>
-              <parallel>all</parallel>
-              <threadCount>4</threadCount>
-              <systemPropertyVariables>
-                <beamTestPipelineOptions>${integrationTestPipelineOptions}</beamTestPipelineOptions>
-              </systemPropertyVariables>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 
@@ -233,13 +209,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.beam</groupId>
-      <artifactId>beam-runners-google-cloud-dataflow-java</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-all</artifactId>
       <scope>test</scope>


[2/2] beam git commit: This closes #2489

Posted by ie...@apache.org.
This closes #2489


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/986fcefc
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/986fcefc
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/986fcefc

Branch: refs/heads/master
Commit: 986fcefcad1e48be951babf8a8ce4aeeaece07e3
Parents: c46b256 17733e3
Author: Isma�l Mej�a <ie...@apache.org>
Authored: Tue Apr 11 17:16:37 2017 +0200
Committer: Isma�l Mej�a <ie...@apache.org>
Committed: Tue Apr 11 17:16:37 2017 +0200

----------------------------------------------------------------------
 runners/google-cloud-dataflow-java/pom.xml |  6 +++++
 sdks/java/io/google-cloud-platform/pom.xml | 31 -------------------------
 2 files changed, 6 insertions(+), 31 deletions(-)
----------------------------------------------------------------------