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/17 22:30:04 UTC
[33/50] [abbrv] beam git commit: Shade direct-java and sql projects.
Update repackaged locations to always use
org.apache.beam.${project.name}.repackaged as prefix
Shade direct-java and sql projects.
Update repackaged locations to always use org.apache.beam.${project.name}.repackaged as prefix
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/4fcee854
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/4fcee854
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/4fcee854
Branch: refs/heads/master
Commit: 4fcee8547170e94123b343cbfe3045ca61eb9f79
Parents: ac9bf03
Author: Luke Cwik <lc...@google.com>
Authored: Tue Nov 7 11:25:26 2017 -0800
Committer: Luke Cwik <lc...@google.com>
Committed: Fri Nov 17 14:27:16 2017 -0800
----------------------------------------------------------------------
build_rules.gradle | 7 +++++--
runners/direct-java/build.gradle | 18 +++++++++++++++---
sdks/java/core/build.gradle | 16 ++++++++--------
sdks/java/extensions/sql/build.gradle | 18 +++++++++++++++---
4 files changed, 43 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/4fcee854/build_rules.gradle
----------------------------------------------------------------------
diff --git a/build_rules.gradle b/build_rules.gradle
index f68d61e..922218d 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -142,9 +142,12 @@ ext.applyJavaNature = {
exclude(".*")
include(dependency(library.java.guava))
}
- relocate("com.google.common", "org.apache.beam." + project.name + ".repackaged.com.google.common") {
+ relocate("com.google.common", "org.apache.beam.${project.name}.repackaged.com.google.common") {
// com.google.common is too generic, need to exclude guava-testlib
-// exclude "com.google.common.**.testing.*"
+ exclude "com.google.common.collect.testing.**"
+ exclude "com.google.common.escape.testing.**"
+ exclude "com.google.common.testing.**"
+ exclude "com.google.common.util.concurrent.testing.**"
}
}
http://git-wip-us.apache.org/repos/asf/beam/blob/4fcee854/runners/direct-java/build.gradle
----------------------------------------------------------------------
diff --git a/runners/direct-java/build.gradle b/runners/direct-java/build.gradle
index 6b93b48..5a7f83a 100644
--- a/runners/direct-java/build.gradle
+++ b/runners/direct-java/build.gradle
@@ -33,10 +33,10 @@ evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
dependencies {
compile library.java.guava
- shadow project(path: ":beam-model-parent:beam-model-pipeline", configuration: "shadow")
+ 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")
shadow project(path: ":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core", configuration: "shadow")
- shadow project(path: ":beam-runners-parent:beam-runners-core-construction-java", configuration: "shadow")
- shadow project(path: ":beam-runners-parent:beam-runners-core-java", configuration: "shadow")
shadow library.java.joda_time
shadow library.java.findbugs_jsr305
shadow library.java.slf4j_api
@@ -54,6 +54,18 @@ dependencies {
testCompile library.java.jackson_dataformat_yaml
}
+shadowJar {
+ dependencies {
+ include(dependency(library.java.protobuf_java))
+ 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"))
+ }
+ relocate "org.apache.beam.runners.core", "org.apache.beam.${project.name}.repackaged.runners.core"
+ relocate "org.apache.beam.model", "org.apache.beam.${project.name}.repackaged.model"
+ relocate "com.google.protobuf", "org.apache.beam.${project.name}.repackaged.com.google.protobuf"
+}
+
task packageTests(type: Jar) {
from sourceSets.test.output
classifier = "tests"
http://git-wip-us.apache.org/repos/asf/beam/blob/4fcee854/sdks/java/core/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/core/build.gradle b/sdks/java/core/build.gradle
index 081623f..cb6f759 100644
--- a/sdks/java/core/build.gradle
+++ b/sdks/java/core/build.gradle
@@ -80,10 +80,10 @@ shadowJar {
include(dependency(library.java.byte_buddy))
include(dependency("org.apache.commons:.*"))
}
- relocate "com.google.thirdparty", "org.apache.beam.sdk.repackaged.com.google.thirdparty"
- relocate "com.google.protobuf", "org.apache.beam.sdk.repackaged.com.google.protobuf"
- relocate "net.bytebuddy", "org.apache.beam.sdk.repackaged.net.bytebuddy"
- relocate "org.apache.commons", "org.apache.beam.sdk.repackaged.org.apache.commons"
+ relocate "com.google.thirdparty", "org.apache.beam.${project.name}.repackaged.com.google.thirdparty"
+ relocate "com.google.protobuf", "org.apache.beam.${project.name}.repackaged.com.google.protobuf"
+ relocate "net.bytebuddy", "org.apache.beam.${project.name}.repackaged.net.bytebuddy"
+ relocate "org.apache.commons", "org.apache.beam.${project.name}.repackaged.org.apache.commons"
}
// Create a shaded test jar.
@@ -105,10 +105,10 @@ task shadowTestJar(type: com.github.jengelman.gradle.plugins.shadow.tasks.Shadow
exclude "com.google.common.testing.**"
exclude "com.google.common.util.concurrent.testing.**"
}
- relocate "com.google.thirdparty", "org.apache.beam.sdk.repackaged.com.google.thirdparty"
- relocate "com.google.protobuf", "org.apache.beam.sdk.repackaged.com.google.protobuf"
- relocate "net.bytebuddy", "org.apache.beam.sdk.repackaged.net.bytebuddy"
- relocate "org.apache.commons", "org.apache.beam.sdk.repackaged.org.apache.commons"
+ relocate "com.google.thirdparty", "org.apache.beam.${project.name}.repackaged.com.google.thirdparty"
+ relocate "com.google.protobuf", "org.apache.beam.${project.name}.repackaged.com.google.protobuf"
+ relocate "net.bytebuddy", "org.apache.beam.${project.name}.repackaged.net.bytebuddy"
+ relocate "org.apache.commons", "org.apache.beam.${project.name}.repackaged.org.apache.commons"
}
task packageTests(type: Jar) {
http://git-wip-us.apache.org/repos/asf/beam/blob/4fcee854/sdks/java/extensions/sql/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/extensions/sql/build.gradle b/sdks/java/extensions/sql/build.gradle
index e037abb..9972bdc 100644
--- a/sdks/java/extensions/sql/build.gradle
+++ b/sdks/java/extensions/sql/build.gradle
@@ -30,11 +30,11 @@ def avatica_version = "1.10.0"
dependencies {
compile library.java.guava
+ compile "org.apache.calcite:calcite-core:$calcite_version"
+ compile "org.apache.calcite:calcite-linq4j:$calcite_version"
+ compile "org.apache.calcite.avatica:avatica-core:$avatica_version"
shadow project(path: ":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core", configuration: "shadow")
shadow project(path: ":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-join-library", configuration: "shadow")
- shadow "org.apache.calcite:calcite-core:$calcite_version"
- shadow "org.apache.calcite:calcite-linq4j:$calcite_version"
- shadow "org.apache.calcite.avatica:avatica-core:$avatica_version"
shadow library.java.slf4j_api
shadow library.java.commons_csv
shadow library.java.joda_time
@@ -46,6 +46,18 @@ dependencies {
testCompile library.java.hamcrest_core
}
+shadowJar {
+ dependencies {
+ include(dependency("org.apache.calcite:.*"))
+ include(dependency("org.apache.calcite.avatica:.*"))
+ include(dependency("org.codehaus.janino:.*"))
+ include(dependency(library.java.protobuf_java))
+ }
+ relocate "com.google.protobuf", "org.apache.beam.${project.name}.repackaged.com.google.protobuf"
+ relocate "org.apache.calcite", "org.apache.beam.${project.name}.repackaged.org.apache.calcite"
+ relocate "org.codehaus", "org.apache.beam.${project.name}.repackaged.org.codehaus"
+}
+
task packageTests(type: Jar) {
from sourceSets.test.output
classifier = "tests"