You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/07/28 16:26:35 UTC
[1/8] beam git commit: Revert accidental changes to sdks/java/pom.xml
Repository: beam
Updated Branches:
refs/heads/gearpump-runner 1ce60b488 -> c35febf1a
Revert accidental changes to sdks/java/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/e655f53c
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/e655f53c
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/e655f53c
Branch: refs/heads/gearpump-runner
Commit: e655f53c2e732bcd082449ba8d0b551f417e8aaa
Parents: 1ce60b4
Author: manuzhang <ow...@gmail.com>
Authored: Fri Jul 21 14:27:37 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Fri Jul 21 14:29:46 2017 +0800
----------------------------------------------------------------------
sdks/java/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/e655f53c/sdks/java/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/pom.xml b/sdks/java/pom.xml
index 3c1b6ec..3144193 100644
--- a/sdks/java/pom.xml
+++ b/sdks/java/pom.xml
@@ -38,7 +38,7 @@
<module>build-tools</module> -->
<module>core</module>
<module>io</module>
- <!--<module>maven-archetypes</module>-->
+ <module>maven-archetypes</module>
<module>extensions</module>
<!-- javadoc runs directly from the root parent as the last module
in the build to be able to capture runner-specific javadoc.
[8/8] beam git commit: This closes #3637: [BEAM-79] Prepare for
merging gearpump-runner
Posted by ke...@apache.org.
This closes #3637: [BEAM-79] Prepare for merging gearpump-runner
Remove gearpump-runner in precommit tests
Override maven-enforcer-plugin for precommit tests
Require java 8 for precommit tests and add gearpump-runner
Deactivate integration-tests for gearpump-runner by default
Add beam-runners-gearpump dependency to javadoc
Upgrade BEAM version to 2.2.0-SNAPSHOT in gearpump-runner
Revert accidental changes to sdks/java/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/c35febf1
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/c35febf1
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/c35febf1
Branch: refs/heads/gearpump-runner
Commit: c35febf1ac60433096bf9ca4b9d43170f3480842
Parents: 1ce60b4 bf15483
Author: Kenneth Knowles <kl...@google.com>
Authored: Fri Jul 28 09:25:55 2017 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Fri Jul 28 09:25:55 2017 -0700
----------------------------------------------------------------------
examples/java/pom.xml | 12 ------------
examples/java8/pom.xml | 12 ++++++++++++
runners/gearpump/pom.xml | 5 ++---
sdks/java/javadoc/pom.xml | 5 +++++
sdks/java/pom.xml | 2 +-
5 files changed, 20 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
[2/8] beam git commit: Upgrade BEAM version to 2.2.0-SNAPSHOT in
gearpump-runner
Posted by ke...@apache.org.
Upgrade BEAM version to 2.2.0-SNAPSHOT in gearpump-runner
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/daa75669
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/daa75669
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/daa75669
Branch: refs/heads/gearpump-runner
Commit: daa7566939e212095ef745ff004580bfe4209b38
Parents: e655f53
Author: manuzhang <ow...@gmail.com>
Authored: Fri Jul 21 14:58:13 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Fri Jul 21 19:45:14 2017 +0800
----------------------------------------------------------------------
runners/gearpump/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/daa75669/runners/gearpump/pom.xml
----------------------------------------------------------------------
diff --git a/runners/gearpump/pom.xml b/runners/gearpump/pom.xml
index 54c8d5c..ee90d48 100644
--- a/runners/gearpump/pom.xml
+++ b/runners/gearpump/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
[3/8] beam git commit: Add beam-runners-gearpump dependency to javadoc
Posted by ke...@apache.org.
Add beam-runners-gearpump dependency to javadoc
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/49d4ed59
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/49d4ed59
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/49d4ed59
Branch: refs/heads/gearpump-runner
Commit: 49d4ed59567852e978d14729c89b9ea91bb96c32
Parents: daa7566
Author: manuzhang <ow...@gmail.com>
Authored: Fri Jul 21 22:33:36 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Sat Jul 22 08:30:18 2017 +0800
----------------------------------------------------------------------
sdks/java/javadoc/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/49d4ed59/sdks/java/javadoc/pom.xml
----------------------------------------------------------------------
diff --git a/sdks/java/javadoc/pom.xml b/sdks/java/javadoc/pom.xml
index 51109fb..e1adb79 100644
--- a/sdks/java/javadoc/pom.xml
+++ b/sdks/java/javadoc/pom.xml
@@ -79,6 +79,11 @@
<dependency>
<groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-gearpump</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.beam</groupId>
<artifactId>beam-sdks-java-core</artifactId>
</dependency>
[5/8] beam git commit: Require java 8 for precommit tests and add
gearpump-runner
Posted by ke...@apache.org.
Require java 8 for precommit tests and add gearpump-runner
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/a282165c
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/a282165c
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/a282165c
Branch: refs/heads/gearpump-runner
Commit: a282165c64ef7b5812fa9e44afd94777211a8707
Parents: d9bb4cb
Author: manuzhang <ow...@gmail.com>
Authored: Wed Jul 26 20:26:05 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Wed Jul 26 20:26:05 2017 +0800
----------------------------------------------------------------------
.../jenkins/job_beam_PreCommit_Java_MavenInstall.groovy | 2 +-
examples/java/pom.xml | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/a282165c/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
index bc130ec..7117f12 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
@@ -41,5 +41,5 @@ mavenJob('beam_PreCommit_Java_MavenInstall') {
common_job_properties.setPreCommit(delegate, 'Maven clean install')
// Maven goals for this job.
- goals('-B -e -Prelease,include-runners,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install coveralls:report')
+ goals('-B -e -Prelease,include-runners,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner,gearpump-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install coveralls:report')
}
http://git-wip-us.apache.org/repos/asf/beam/blob/a282165c/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index ae64a79..bd18889 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -155,6 +155,9 @@
<!-- Custom set up for our Jenkins precommit tests that comment on GitHub -->
<profile>
<id>jenkins-precommit</id>
+ <activation>
+ <jdk>[1.8,)</jdk>
+ </activation>
<properties>
<skipITs>false</skipITs>
<skipDefaultIT>true</skipDefaultIT>
@@ -175,6 +178,11 @@
<version>${apex.kryo.version}</version>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-gearpump</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
[7/8] beam git commit: Remove gearpump-runner in precommit tests
Posted by ke...@apache.org.
Remove gearpump-runner in precommit tests
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/bf154835
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/bf154835
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/bf154835
Branch: refs/heads/gearpump-runner
Commit: bf15483566ea759d2bc4af14173927402277738b
Parents: 18daed9
Author: manuzhang <ow...@gmail.com>
Authored: Thu Jul 27 12:57:28 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Thu Jul 27 12:57:28 2017 +0800
----------------------------------------------------------------------
.../job_beam_PreCommit_Java_MavenInstall.groovy | 2 +-
examples/java/pom.xml | 30 --------------------
2 files changed, 1 insertion(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/bf154835/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
----------------------------------------------------------------------
diff --git a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
index 7117f12..bc130ec 100644
--- a/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
+++ b/.test-infra/jenkins/job_beam_PreCommit_Java_MavenInstall.groovy
@@ -41,5 +41,5 @@ mavenJob('beam_PreCommit_Java_MavenInstall') {
common_job_properties.setPreCommit(delegate, 'Maven clean install')
// Maven goals for this job.
- goals('-B -e -Prelease,include-runners,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner,gearpump-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install coveralls:report')
+ goals('-B -e -Prelease,include-runners,jenkins-precommit,direct-runner,dataflow-runner,spark-runner,flink-runner,apex-runner -DrepoToken=$COVERALLS_REPO_TOKEN -DpullRequest=$ghprbPullId help:effective-settings clean install coveralls:report')
}
http://git-wip-us.apache.org/repos/asf/beam/blob/bf154835/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 6a1ce99..ae64a79 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -155,9 +155,6 @@
<!-- Custom set up for our Jenkins precommit tests that comment on GitHub -->
<profile>
<id>jenkins-precommit</id>
- <activation>
- <jdk>[1.8,)</jdk>
- </activation>
<properties>
<skipITs>false</skipITs>
<skipDefaultIT>true</skipDefaultIT>
@@ -178,39 +175,12 @@
<version>${apex.kryo.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.beam</groupId>
- <artifactId>beam-runners-gearpump</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <enforceBytecodeVersion>
- <maxJdkVersion>1.8</maxJdkVersion>
- </enforceBytecodeVersion>
- <requireJavaVersion>
- <version>[1.8,)</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<useManifestOnlyJar>false</useManifestOnlyJar>
[4/8] beam git commit: Deactivate integration-tests for
gearpump-runner by default
Posted by ke...@apache.org.
Deactivate integration-tests for gearpump-runner by default
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/d9bb4cb6
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/d9bb4cb6
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/d9bb4cb6
Branch: refs/heads/gearpump-runner
Commit: d9bb4cb66b6b80269795343e5be3b85aab1e7b6a
Parents: 49d4ed5
Author: manuzhang <ow...@gmail.com>
Authored: Tue Jul 25 15:14:49 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Wed Jul 26 12:29:34 2017 +0800
----------------------------------------------------------------------
examples/java/pom.xml | 12 ------------
examples/java8/pom.xml | 12 ++++++++++++
runners/gearpump/pom.xml | 3 +--
3 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/d9bb4cb6/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index 2d43527..ae64a79 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -89,18 +89,6 @@
</dependencies>
</profile>
- <!-- Include the Apache Gearpump (incubating) runner with -P gearpump-runner -->
- <profile>
- <id>gearpump-runner</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.beam</groupId>
- <artifactId>beam-runners-gearpump</artifactId>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </profile>
-
<!-- Include the Apache Flink runner with -P flink-runner -->
<profile>
<id>flink-runner</id>
http://git-wip-us.apache.org/repos/asf/beam/blob/d9bb4cb6/examples/java8/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java8/pom.xml b/examples/java8/pom.xml
index 6fd29a4..7beb955 100644
--- a/examples/java8/pom.xml
+++ b/examples/java8/pom.xml
@@ -151,6 +151,18 @@
</dependency>
</dependencies>
</profile>
+
+ <!-- Include the Apache Gearpump (incubating) runner with -P gearpump-runner -->
+ <profile>
+ <id>gearpump-runner</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-runners-gearpump</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<build>
http://git-wip-us.apache.org/repos/asf/beam/blob/d9bb4cb6/runners/gearpump/pom.xml
----------------------------------------------------------------------
diff --git a/runners/gearpump/pom.xml b/runners/gearpump/pom.xml
index ee90d48..3a4722f 100644
--- a/runners/gearpump/pom.xml
+++ b/runners/gearpump/pom.xml
@@ -49,8 +49,7 @@
<profiles>
<profile>
<id>local-validates-runner-tests</id>
- <!-- TODO: once on master branch, move to postcommit only -->
- <activation><activeByDefault>true</activeByDefault></activation>
+ <activation><activeByDefault>false</activeByDefault></activation>
<build>
<plugins>
<plugin>
[6/8] beam git commit: Override maven-enforcer-plugin for precommit
tests
Posted by ke...@apache.org.
Override maven-enforcer-plugin for precommit tests
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/18daed90
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/18daed90
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/18daed90
Branch: refs/heads/gearpump-runner
Commit: 18daed908d47aa2605507e7c91f42695dd8fae9f
Parents: a282165
Author: manuzhang <ow...@gmail.com>
Authored: Thu Jul 27 08:54:18 2017 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Thu Jul 27 08:54:18 2017 +0800
----------------------------------------------------------------------
examples/java/pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/18daed90/examples/java/pom.xml
----------------------------------------------------------------------
diff --git a/examples/java/pom.xml b/examples/java/pom.xml
index bd18889..6a1ce99 100644
--- a/examples/java/pom.xml
+++ b/examples/java/pom.xml
@@ -189,6 +189,28 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <enforceBytecodeVersion>
+ <maxJdkVersion>1.8</maxJdkVersion>
+ </enforceBytecodeVersion>
+ <requireJavaVersion>
+ <version>[1.8,)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<useManifestOnlyJar>false</useManifestOnlyJar>