You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/09/14 04:34:27 UTC

[1/2] incubator-beam git commit: [BEAM-79] fix integration-test failure

Repository: incubator-beam
Updated Branches:
  refs/heads/gearpump-runner ed7c4aaf9 -> 8f4334cf8


[BEAM-79] fix integration-test failure


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

Branch: refs/heads/gearpump-runner
Commit: 272fe9f6eb6c721a1d4a39cc816e3de9dc705373
Parents: ed7c4aa
Author: manuzhang <ow...@gmail.com>
Authored: Wed Sep 14 11:20:27 2016 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Wed Sep 14 11:28:05 2016 +0800

----------------------------------------------------------------------
 runners/gearpump/pom.xml | 55 +++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/272fe9f6/runners/gearpump/pom.xml
----------------------------------------------------------------------
diff --git a/runners/gearpump/pom.xml b/runners/gearpump/pom.xml
index 296de6b..6576ba6 100644
--- a/runners/gearpump/pom.xml
+++ b/runners/gearpump/pom.xml
@@ -32,6 +32,14 @@
   <name>Apache Beam :: Runners :: Gearpump</name>
   <packaging>jar</packaging>
 
+  <repositories>
+    <repository>
+      <id>apache-repo</id>
+      <name>apache maven repo</name>
+      <url>https://repository.apache.org/content/repositories/releases</url>
+    </repository>
+  </repositories>
+
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -47,22 +55,24 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.19.1</version>
             <executions>
               <execution>
                 <id>runnable-on-service-tests</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>test</goal>
+                </goals>
                 <configuration>
                   <groups>org.apache.beam.sdk.testing.RunnableOnService</groups>
                   <parallel>none</parallel>
                   <failIfNoTests>true</failIfNoTests>
                   <dependenciesToScan>
                     <dependency>org.apache.beam:beam-sdks-java-core</dependency>
-                    <dependency>org.apache.beam:beam-runners-java-core</dependency>
                   </dependenciesToScan>
                   <excludes>
                     <!-- side input is not supported in Gearpump -->
                     <exclude>
-                      org.apache.beam.sdk.io.BigQueryIOTest,
+                      org.apache.beam.sdk.io.gcp.bigquery.BigQueryIOTest,
                       org.apache.beam.sdk.io.CountingInputTest,
                       org.apache.beam.sdk.io.CountingSourceTest,
                       org.apache.beam.sdk.testing.PAssertTest,
@@ -189,6 +199,20 @@
       <artifactId>guava</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.gearpump</groupId>
+      <artifactId>gearpump-shaded-metrics-graphite_2.11</artifactId>
+      <version>${gearpump.version}</version>
+      <classifier>assembly</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.gearpump</groupId>
+      <artifactId>gearpump-shaded-guava_2.11</artifactId>
+      <version>${gearpump.version}</version>
+      <classifier>assembly</classifier>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
@@ -218,9 +242,7 @@
     <dependency>
       <groupId>com.google.auto.service</groupId>
       <artifactId>auto-service</artifactId>
-      <version>1.0-rc2</version>
     </dependency>
-
   </dependencies>
 
   <build>
@@ -245,29 +267,6 @@
         <artifactId>maven-compiler-plugin</artifactId>
       </plugin>
 
-      <!-- Integration Tests -->
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <forkCount>1</forkCount>
-          <argLine>-Dlog4j.configuration=log4j-test.properties  -XX:-UseGCOverheadLimit</argLine>
-        </configuration>
-      </plugin>
-
-      <!-- Unit Tests -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-
       <!-- uber jar -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>


[2/2] incubator-beam git commit: Closes #956

Posted by dh...@apache.org.
Closes #956


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

Branch: refs/heads/gearpump-runner
Commit: 8f4334cf8ac7f27005c730a9d7217d2afb0f6245
Parents: ed7c4aa 272fe9f
Author: Dan Halperin <dh...@google.com>
Authored: Tue Sep 13 21:32:35 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Tue Sep 13 21:32:35 2016 -0700

----------------------------------------------------------------------
 runners/gearpump/pom.xml | 55 +++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 28 deletions(-)
----------------------------------------------------------------------