You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2017/11/20 17:15:51 UTC
[5/6] beam git commit: Sync with master and add new subproject for
beam-runners-local-java-core
Sync with master and add new subproject for beam-runners-local-java-core
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/b565925f
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/b565925f
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/b565925f
Branch: refs/heads/master
Commit: b565925f487a703b9190774ca8d17ce068076c11
Parents: af9bfe5
Author: Luke Cwik <lc...@google.com>
Authored: Sun Nov 19 10:38:06 2017 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Sun Nov 19 10:38:06 2017 -0800
----------------------------------------------------------------------
runners/direct-java/build.gradle | 2 ++
runners/local-java/build.gradle | 43 +++++++++++++++++++++++++++++++++++
settings.gradle | 2 ++
3 files changed, 47 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/b565925f/runners/direct-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle
index 335e552..fa0a65f 100644
--- a/runners/direct-java/build.gradle
+++ b/runners/direct-java/build.gradle
@@ -36,6 +36,7 @@ dependencies {
compile project(path: ":beam-model-parent:beam-model-pipeline", configuration: "shadow")
compile project(path: ":beam-runners-parent:beam-runners-core-construction-java", configuration: "shadow")
compile project(path: ":beam-runners-parent:beam-runners-core-java", configuration: "shadow")
+ compile project(path: ":beam-runners-parent:beam-runners-local-java-core", configuration: "shadow")
shadow project(path: ":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core", configuration: "shadow")
shadow library.java.joda_time
shadow library.java.findbugs_jsr305
@@ -60,6 +61,7 @@ shadowJar {
include(project(path: ":beam-model-parent:beam-model-pipeline", configuration: "shadow"))
include(project(path: ":beam-runners-parent:beam-runners-core-construction-java", configuration: "shadow"))
include(project(path: ":beam-runners-parent:beam-runners-core-java", configuration: "shadow"))
+ include(project(path: ":beam-runners-parent:beam-runners-local-java-core", configuration: "shadow"))
}
relocate "org.apache.beam.runners.core", "org.apache.beam." + project.name.replace("-", ".") + ".repackaged.runners.core"
relocate "org.apache.beam.model", "org.apache.beam." + project.name.replace("-", ".") + ".repackaged.model"
http://git-wip-us.apache.org/repos/asf/beam/blob/b565925f/runners/local-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/local-java/build.gradle b/runners/local-java/build.gradle
new file mode 100644
index 0000000..492cb94
--- /dev/null
+++ b/runners/local-java/build.gradle
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply from: project(":").file("build_rules.gradle")
+applyJavaNature()
+
+description = "Apache Beam :: Runners :: Local Java Core"
+
+dependencies {
+ /*
+ * The Local Java Core artifact should carefully manage the classes made available by this
+ * dependency. The Java SDK should be used to provide common utilities (e.g. Coder, WindowedValue)
+ * but should not be used within this library to execute any UDFs.
+ * TODO: Add an APISurfaceTest to force this to be the case, if possible.
+ */
+ shadow project(path: ":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core", configuration: "shadow")
+ shadow library.java.joda_time
+ shadow library.java.findbugs_jsr305
+ shadowTest library.java.hamcrest_core
+ shadowTest library.java.junit
+}
+
+task packageTests(type: Jar) {
+ from sourceSets.test.output
+ classifier = "tests"
+}
+
+artifacts.archives packageTests
http://git-wip-us.apache.org/repos/asf/beam/blob/b565925f/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index cd5a9f7..7eb25aa 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -81,6 +81,7 @@ include ':beam-runners-parent:beam-runners-reference-parent'
include ':beam-runners-parent:beam-runners-direct-java'
include ':beam-runners-parent:beam-runners-flink_2.10'
include ':beam-runners-parent:beam-runners-google-cloud-dataflow-java'
+include ':beam-runners-parent:beam-runners-local-java-core'
include ':beam-runners-parent:beam-runners-spark'
include ':beam-runners-parent:beam-runners-apex'
include ':beam-runners-parent:beam-runners-gcp-parent:beam-runners-gcp-gcemd'
@@ -157,6 +158,7 @@ project(':beam-runners-parent:beam-runners-reference-parent').projectDir = "$roo
project(':beam-runners-parent:beam-runners-direct-java').projectDir = "$rootDir/runners/direct-java" as File
project(':beam-runners-parent:beam-runners-flink_2.10').projectDir = "$rootDir/runners/flink" as File
project(':beam-runners-parent:beam-runners-google-cloud-dataflow-java').projectDir = "$rootDir/runners/google-cloud-dataflow-java" as File
+project(':beam-runners-parent:beam-runners-local-java-core').projectDir = "$rootDir/runners/local-java" as File
project(':beam-runners-parent:beam-runners-spark').projectDir = "$rootDir/runners/spark" as File
project(':beam-runners-parent:beam-runners-apex').projectDir = "$rootDir/runners/apex" as File
project(':beam-runners-parent:beam-runners-gcp-parent:beam-runners-gcp-gcemd').projectDir = "$rootDir/runners/gcp/gcemd" as File