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 2019/09/24 21:04:03 UTC
[beam] 01/01: Merge branch 'lgajowy-BEAM-8021'
This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
commit 2acbfbd23a23ee6eed77cbe74690f66f985c9815
Merge: f07bd7a 5ea2878
Author: Luke Cwik <lc...@google.com>
AuthorDate: Tue Sep 24 14:02:44 2019 -0700
Merge branch 'lgajowy-BEAM-8021'
.../org/apache/beam/gradle/BeamModulePlugin.groovy | 33 ++++++++++++++++++++++
examples/java/build.gradle | 2 +-
examples/kotlin/build.gradle | 2 +-
model/fn-execution/build.gradle | 5 +++-
model/job-management/build.gradle | 10 ++++---
model/pipeline/build.gradle | 5 +++-
runners/apex/build.gradle | 2 +-
runners/core-construction-java/build.gradle | 2 +-
runners/core-java/build.gradle | 2 +-
runners/direct-java/build.gradle | 24 ++++++++--------
runners/extensions-java/metrics/build.gradle | 2 +-
runners/flink/flink_runner.gradle | 3 +-
runners/flink/job-server/flink_job_server.gradle | 1 +
runners/gearpump/build.gradle | 2 +-
runners/google-cloud-dataflow-java/build.gradle | 2 +-
.../worker/windmill/build.gradle | 1 +
runners/java-fn-execution/build.gradle | 2 +-
runners/jet/build.gradle | 2 +-
runners/local-java/build.gradle | 1 +
runners/reference/java/build.gradle | 2 +-
runners/samza/build.gradle | 2 +-
runners/samza/job-server/build.gradle | 1 +
runners/spark/build.gradle | 2 +-
runners/spark/job-server/build.gradle | 1 +
sdks/java/build-tools/build.gradle | 2 +-
sdks/java/core/build.gradle | 23 ++++++++-------
sdks/java/extensions/euphoria/build.gradle | 2 +-
.../google-cloud-platform-core/build.gradle | 2 +-
sdks/java/extensions/jackson/build.gradle | 1 +
sdks/java/extensions/join-library/build.gradle | 2 +-
sdks/java/extensions/kryo/build.gradle | 1 +
sdks/java/extensions/protobuf/build.gradle | 2 +-
sdks/java/extensions/sketching/build.gradle | 2 +-
sdks/java/extensions/sorter/build.gradle | 2 +-
sdks/java/extensions/sql/build.gradle | 1 +
sdks/java/extensions/sql/datacatalog/build.gradle | 2 +-
sdks/java/extensions/sql/hcatalog/build.gradle | 2 +-
sdks/java/extensions/sql/jdbc/build.gradle | 1 +
sdks/java/extensions/zetasketch/build.gradle | 2 +-
sdks/java/fn-execution/build.gradle | 2 +-
sdks/java/harness/build.gradle | 1 +
sdks/java/io/amazon-web-services/build.gradle | 2 +-
sdks/java/io/amazon-web-services2/build.gradle | 2 +-
sdks/java/io/amqp/build.gradle | 2 +-
sdks/java/io/bigquery-io-perf-tests/build.gradle | 2 +-
sdks/java/io/cassandra/build.gradle | 2 +-
sdks/java/io/clickhouse/build.gradle | 1 +
sdks/java/io/common/build.gradle | 2 +-
.../elasticsearch-tests-2/build.gradle | 1 +
.../elasticsearch-tests-5/build.gradle | 1 +
.../elasticsearch-tests-6/build.gradle | 1 +
.../elasticsearch-tests-common/build.gradle | 1 +
sdks/java/io/elasticsearch/build.gradle | 2 +-
sdks/java/io/file-based-io-tests/build.gradle | 2 +-
sdks/java/io/google-cloud-platform/build.gradle | 1 +
sdks/java/io/hadoop-common/build.gradle | 2 +-
sdks/java/io/hadoop-file-system/build.gradle | 2 +-
sdks/java/io/hadoop-format/build.gradle | 2 +-
sdks/java/io/hbase/build.gradle | 2 +-
sdks/java/io/hcatalog/build.gradle | 2 +-
sdks/java/io/jdbc/build.gradle | 2 +-
sdks/java/io/jms/build.gradle | 2 +-
sdks/java/io/kafka/build.gradle | 2 +-
sdks/java/io/kinesis/build.gradle | 2 +-
sdks/java/io/kudu/build.gradle | 2 +-
sdks/java/io/mongodb/build.gradle | 2 +-
sdks/java/io/mqtt/build.gradle | 2 +-
sdks/java/io/parquet/build.gradle | 2 +-
sdks/java/io/rabbitmq/build.gradle | 2 +-
sdks/java/io/redis/build.gradle | 2 +-
sdks/java/io/solr/build.gradle | 2 +-
sdks/java/io/synthetic/build.gradle | 2 +-
sdks/java/io/tika/build.gradle | 2 +-
sdks/java/io/xml/build.gradle | 2 +-
sdks/java/javadoc/build.gradle | 2 +-
sdks/java/maven-archetypes/examples/build.gradle | 2 +-
sdks/java/maven-archetypes/starter/build.gradle | 2 +-
sdks/java/testing/expansion-service/build.gradle | 2 +-
sdks/java/testing/load-tests/build.gradle | 1 +
sdks/java/testing/nexmark/build.gradle | 1 +
sdks/java/testing/test-utils/build.gradle | 1 +
vendor/sdks-java-extensions-protobuf/build.gradle | 1 +
82 files changed, 150 insertions(+), 83 deletions(-)
diff --cc sdks/java/extensions/sql/build.gradle
index d220e10,571f4da..d5e4bd2
--- a/sdks/java/extensions/sql/build.gradle
+++ b/sdks/java/extensions/sql/build.gradle
@@@ -23,8 -23,48 +23,9 @@@ plugins
id 'ca.coglinc.javacc'
}
applyJavaNature(
+ automaticModuleName: 'org.apache.beam.sdk.extensions.sql',
// javacc generated code produces lint warnings
- disableLintWarnings: ['dep-ann'],
- testShadowJar: true,
- enableStrictDependencies: true,
- shadowClosure: {
- dependencies {
- include(dependency(library.java.guava))
- include(dependency(library.java.protobuf_java))
- include(dependency(library.java.protobuf_java_util))
- include(dependency("org.apache.calcite:.*"))
- include(dependency("org.apache.calcite.avatica:.*"))
- include(dependency("org.codehaus.janino:.*"))
- include(dependency("com.google.zetasql:.*"))
- }
- // guava uses the com.google.common and com.google.thirdparty package namespaces
- relocate("com.google.common", project.getJavaRelocatedPath("com.google.common")) {
- // com.google.common is too generic, need to exclude guava-testlib
- exclude "com.google.common.collect.testing.**"
- exclude "com.google.common.escape.testing.**"
- exclude "com.google.common.testing.**"
- exclude "com.google.common.util.concurrent.testing.**"
- }
- relocate "com.google.cloud", getJavaRelocatedPath("com.google.cloud")
- relocate "com.google.logging", getJavaRelocatedPath("com.google.logging")
- relocate "com.google.longrunning", getJavaRelocatedPath("com.google.longrunning")
- relocate "com.google.rpc", getJavaRelocatedPath("com.google.rpc")
-
- relocate "com.google.thirdparty", project.getJavaRelocatedPath("com.google.thirdparty")
-
- relocate "com.google.protobuf", getJavaRelocatedPath("com.google.protobuf")
- relocate "com.google.zetasql", getJavaRelocatedPath("com.google.zetasql")
- relocate "org.apache.calcite", getJavaRelocatedPath("org.apache.calcite")
-
- // Looking up the compiler factory in Calcite depends on having a properties
- // file in the right location. We package one that is shading compatible
- // in src/main/resources. Note that if this shaded path changes, that
- // files name and contents need to be updated as well. TODO, swap to use
- // getJavaRelocatedPath once the Maven build is no longer also shading this
- // module.
- relocate "org.codehaus", "org.apache.beam.sdks.java.extensions.sql.repackaged.org.codehaus"
-})
+ disableLintWarnings: ['dep-ann'])
description = "Apache Beam :: SDKs :: Java :: Extensions :: SQL"
ext.summary = "Beam SQL provides a new interface to generate a Beam pipeline from SQL statement"