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:29:37 UTC
[06/50] [abbrv] beam git commit: Define the correct versions of
apex-core Add comments to hcatalog/hbase builds Include the same default set
of files as the maven-surefire-plugin
Define the correct versions of apex-core
Add comments to hcatalog/hbase builds
Include the same default set of files as the maven-surefire-plugin
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/45628391
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/45628391
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/45628391
Branch: refs/heads/master
Commit: 456283916a93162069d312525cbb767359ef0f28
Parents: 854a82b
Author: Luke Cwik <lc...@google.com>
Authored: Fri Nov 3 16:40:00 2017 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Fri Nov 17 14:27:15 2017 -0800
----------------------------------------------------------------------
build.gradle | 8 +++++---
build_rules.gradle | 12 +++++++++---
runners/apex/build.gradle | 5 +++++
sdks/java/io/hbase/build.gradle | 12 +++++++-----
sdks/java/io/hcatalog/build.gradle | 13 ++++++++-----
5 files changed, 34 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/45628391/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 18a9fab..f8cefa5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,6 +32,8 @@ def hadoop_version = "2.7.3"
def jackson_version = "2.8.9"
def spark_version = "1.6.3"
def pubsub_grpc_version = "0.1.18"
+def apex_core_version = "3.6.0"
+def apex_malhar_version = "3.4.0"
ext.library = [
java: [
@@ -42,8 +44,8 @@ ext.library = [
activemq_junit: "org.apache.activemq.tooling:activemq-junit:5.13.1",
activemq_kahadb_store: "org.apache.activemq:activemq-kahadb-store:5.13.1",
activemq_mqtt: "org.apache.activemq:activemq-mqtt:5.13.1",
- apex_common: "org.apache.apex:apex-common:3.6.0",
- apex_engine: "org.apache.apex:apex-engine:3.4.0",
+ apex_common: "org.apache.apex:apex-common:$apex_core_version",
+ apex_engine: "org.apache.apex:apex-engine:$apex_core_version",
args4j: "args4j:args4j:2.33",
avro: "org.apache.avro:avro:1.8.2",
bigdataoss_gcsio: "com.google.cloud.bigdataoss:gcsio:$google_cloud_bigdataoss_version",
@@ -110,7 +112,7 @@ ext.library = [
joda_time: "joda-time:joda-time:2.4",
junit: "junit:junit:4.12",
kafka_clients: "org.apache.kafka:kafka-clients:0.10.1.0",
- malhar_library: "org.apache.apex:malhar-library:3.4.0",
+ malhar_library: "org.apache.apex:malhar-library:$apex_malhar_version",
mockito_core: "org.mockito:mockito-core:1.9.5",
netty_handler: "io.netty:netty-handler:$netty_version",
netty_tcnative_boringssl_static: "io.netty:netty-tcnative-boringssl-static:1.1.33.Fork26",
http://git-wip-us.apache.org/repos/asf/beam/blob/45628391/build_rules.gradle
----------------------------------------------------------------------
diff --git a/build_rules.gradle b/build_rules.gradle
index 4f3b4df..37b93a8 100644
--- a/build_rules.gradle
+++ b/build_rules.gradle
@@ -71,8 +71,12 @@ ext.applyJavaNature = {
// Skip test failures to enumerate all that is failing
test {
-// ignoreFailures = true
- exclude '**/*IT.class'
+ // Configure the gradle include defaults to be equivalent to the maven-surefire-plugin
+ // http://maven.apache.org/components/surefire/maven-surefire-plugin/test-mojo.html
+ include "**/Test*.class"
+ include "**/*Test.class"
+ include "**/*Tests.class"
+ include "**/*TestCase.class"
useJUnit { }
}
@@ -125,10 +129,12 @@ ext.applyJavaNature = {
// Ban these dependencies from all configurations
configurations.all {
- // This is banned because it brings in classes which conflict with guava
+ // guava-jdk5 brings in classes which conflict with guava
exclude group: "com.google.guava", module: "guava-jdk5"
// Ban the usage of the JDK tools as a library as this is system dependent
exclude group: "jdk.tools", module: "jdk.tools"
+ // protobuf-lite duplicates classes which conflict with protobuf-java
+ exclude group: "com.google.protobuf", module: "protobuf-lite"
// Exclude these test dependencies because they bundle other common
// test libraries classes causing version conflicts. Users should rely
// on using the yyy-core package instead of the yyy-all package.
http://git-wip-us.apache.org/repos/asf/beam/blob/45628391/runners/apex/build.gradle
----------------------------------------------------------------------
diff --git a/runners/apex/build.gradle b/runners/apex/build.gradle
index fb2c94c..75393b4 100644
--- a/runners/apex/build.gradle
+++ b/runners/apex/build.gradle
@@ -52,6 +52,11 @@ dependencies {
testCompile library.java.jackson_dataformat_yaml
}
+task testDependencyTree {
+
+}
+test.dependsOn
+
task packageTests(type: Jar) {
from sourceSets.test.output
classifier = "tests"
http://git-wip-us.apache.org/repos/asf/beam/blob/45628391/sdks/java/io/hbase/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hbase/build.gradle b/sdks/java/io/hbase/build.gradle
index 7afdd7f..19c1b54 100644
--- a/sdks/java/io/hbase/build.gradle
+++ b/sdks/java/io/hbase/build.gradle
@@ -38,13 +38,15 @@ test {
}
}
+def hbase_version = "1.2.6"
+
dependencies {
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hadoop-common")
compile library.java.guava
compile library.java.findbugs_jsr305
compile library.java.slf4j_api
- compile "org.apache.hbase:hbase-shaded-client:1.2.6"
+ compile "org.apache.hbase:hbase-shaded-client:$hbase_version"
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.commons_lang3
@@ -53,10 +55,10 @@ dependencies {
testCompile library.java.hadoop_minicluster
testCompile library.java.hadoop_hdfs
testCompile library.java.hadoop_common
- testCompile "org.apache.hbase:hbase-shaded-server:1.2.6"
- testCompile "org.apache.hbase:hbase-server:1.2.6:tests"
- testCompile "org.apache.hbase:hbase-hadoop-compat:1.2.6"
- testCompile "org.apache.hbase:hbase-hadoop2-compat:1.2.6"
+ testCompile "org.apache.hbase:hbase-shaded-server:$hbase_version"
+ testCompile "org.apache.hbase:hbase-server:$hbase_version:tests"
+ testCompile "org.apache.hbase:hbase-hadoop-compat:$hbase_version:tests"
+ testCompile "org.apache.hbase:hbase-hadoop2-compat:$hbase_version:tests"
}
task packageTests(type: Jar) {
http://git-wip-us.apache.org/repos/asf/beam/blob/45628391/sdks/java/io/hcatalog/build.gradle
----------------------------------------------------------------------
diff --git a/sdks/java/io/hcatalog/build.gradle b/sdks/java/io/hcatalog/build.gradle
index bd24b82..9e86bd3 100644
--- a/sdks/java/io/hcatalog/build.gradle
+++ b/sdks/java/io/hcatalog/build.gradle
@@ -23,9 +23,12 @@ description = "Apache Beam :: SDKs :: Java :: IO :: HCatalog"
def hive_version = "2.1.0"
-// TODO: Get tests to run. Known issues:
-// * calcite-avatica bundles w/o repackaging Jackson (CALCITE-1110)
-// * hive-exec bundles w/o repackaging Guava (HIVE-13690)
+test {
+ // TODO: Get tests to run. Known issues:
+ // * calcite-avatica bundles w/o repackaging Jackson (CALCITE-1110)
+ // * hive-exec bundles w/o repackaging Guava (HIVE-13690)
+ ignoreFailures true
+}
dependencies {
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
@@ -36,8 +39,8 @@ dependencies {
provided library.java.hadoop_common
provided "org.apache.hive:hive-exec:$hive_version"
provided(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version: hive_version) {
- exclude module: "hive-exec"
- exclude module: "protobuf-java"
+ exclude group: "org.apache.hive", module: "hive-exec"
+ exclude group: "com.google.protobuf", module: "protobuf-java"
}
testCompile project(":beam-runners-parent:beam-runners-direct-java")
testCompile library.java.commons_io_2x