Skip to content
代码片段 群组 项目
提交 4d6f9949 编辑于 作者: Luke Cwik's avatar Luke Cwik
浏览文件

Add provided scope plugin and migrate compileOnly/testCompileOnly to provided scope

上级 6109b328
No related branches found
No related tags found
无相关合并请求
...@@ -147,10 +147,14 @@ buildscript { ...@@ -147,10 +147,14 @@ buildscript {
maven { maven {
url "https://plugins.gradle.org/m2/" url "https://plugins.gradle.org/m2/"
} }
maven {
url "http://repo.spring.io/plugins-release"
}
} }
dependencies { dependencies {
classpath "net.ltgt.gradle:gradle-apt-plugin:0.12" classpath "net.ltgt.gradle:gradle-apt-plugin:0.12"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.1" classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.1"
classpath "io.spring.gradle:propdeps-plugin:0.0.9.RELEASE"
} }
} }
...@@ -159,7 +163,7 @@ subprojects { ...@@ -159,7 +163,7 @@ subprojects {
sourceCompatibility = 1.7 sourceCompatibility = 1.7
targetCompatibility = 1.7 targetCompatibility = 1.7
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }
repositories { repositories {
mavenLocal() mavenLocal()
...@@ -170,10 +174,15 @@ subprojects { ...@@ -170,10 +174,15 @@ subprojects {
maven { url "https://repository.apache.org/content/repositories/releases" } maven { url "https://repository.apache.org/content/repositories/releases" }
} }
// Skip test failures to enumerate all that is failing
test {
ignoreFailures = true
}
apply plugin: "net.ltgt.apt" apply plugin: "net.ltgt.apt"
def auto_value = "com.google.auto.value:auto-value:1.4.1"
def auto_service = "com.google.auto.service:auto-service:1.0-rc2"
dependencies { dependencies {
def auto_value = "com.google.auto.value:auto-value:1.4.1"
def auto_service = "com.google.auto.service:auto-service:1.0-rc2"
compileOnly auto_value compileOnly auto_value
apt auto_value apt auto_value
testCompileOnly auto_value testCompileOnly auto_value
...@@ -214,6 +223,12 @@ subprojects { ...@@ -214,6 +223,12 @@ subprojects {
} }
} }
apply plugin: 'propdeps'
apply plugin: 'propdeps-maven'
configurations.all { configurations.all {
} }
} }
...@@ -30,18 +30,18 @@ dependencies { ...@@ -30,18 +30,18 @@ dependencies {
compile library.java.joda_time compile library.java.joda_time
compile library.java.commons_text compile library.java.commons_text
compile "io.dropwizard.metrics:metrics-core:3.1.2" compile "io.dropwizard.metrics:metrics-core:3.1.2"
compileOnly library.java.spark_core provided library.java.spark_core
compileOnly library.java.spark_streaming provided library.java.spark_streaming
compileOnly library.java.spark_network_common provided library.java.spark_network_common
compileOnly library.java.hadoop_common provided library.java.hadoop_common
compileOnly library.java.hadoop_mapreduce_client_core provided library.java.hadoop_mapreduce_client_core
compileOnly library.java.commons_compress provided library.java.commons_compress
compileOnly library.java.commons_lang3 provided library.java.commons_lang3
compileOnly library.java.commons_io_2x provided library.java.commons_io_2x
compileOnly library.java.hamcrest_all provided library.java.hamcrest_all
compileOnly "org.apache.zookeeper:zookeeper:3.4.6" provided "org.apache.zookeeper:zookeeper:3.4.6"
compileOnly "org.scala-lang:scala-library:2.10.5" provided "org.scala-lang:scala-library:2.10.5"
compileOnly "com.esotericsoftware.kryo:kryo:2.21" provided "com.esotericsoftware.kryo:kryo:2.21"
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-kafka") testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-kafka")
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core").sourceSets.test.output
testCompile project(":beam-model-parent:beam-model-fn-execution").sourceSets.test.output testCompile project(":beam-model-parent:beam-model-fn-execution").sourceSets.test.output
...@@ -52,18 +52,6 @@ dependencies { ...@@ -52,18 +52,6 @@ dependencies {
testCompile library.java.mockito_all testCompile library.java.mockito_all
testCompile library.java.jackson_dataformat_yaml testCompile library.java.jackson_dataformat_yaml
testCompile "org.apache.kafka:kafka_2.10:0.9.0.1" testCompile "org.apache.kafka:kafka_2.10:0.9.0.1"
testCompileOnly library.java.spark_core
testCompileOnly library.java.spark_streaming
testCompileOnly library.java.spark_network_common
testCompileOnly library.java.hadoop_common
testCompileOnly library.java.hadoop_mapreduce_client_core
testCompileOnly library.java.commons_compress
testCompileOnly library.java.commons_lang3
testCompileOnly library.java.commons_io_2x
testCompileOnly library.java.hamcrest_all
testCompileOnly "org.apache.zookeeper:zookeeper:3.4.6"
testCompileOnly "org.scala-lang:scala-library:2.10.5"
testCompileOnly "com.esotericsoftware.kryo:kryo:2.21"
} }
task packageTests(type: Jar) { task packageTests(type: Jar) {
......
...@@ -21,15 +21,12 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop Common" ...@@ -21,15 +21,12 @@ description = "Apache Beam :: SDKs :: Java :: IO :: Hadoop Common"
dependencies { 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-core")
compile library.java.findbugs_jsr305 compile library.java.findbugs_jsr305
compileOnly library.java.hadoop_client provided library.java.hadoop_client
compileOnly library.java.hadoop_common provided library.java.hadoop_common
compileOnly library.java.hadoop_mapreduce_client_core provided library.java.hadoop_mapreduce_client_core
testCompile library.java.commons_lang3 testCompile library.java.commons_lang3
testCompile library.java.hamcrest_all testCompile library.java.hamcrest_all
testCompile library.java.junit testCompile library.java.junit
testCompileOnly library.java.hadoop_client
testCompileOnly library.java.hadoop_common
testCompileOnly library.java.hadoop_mapreduce_client_core
} }
task packageTests(type: Jar) { task packageTests(type: Jar) {
......
...@@ -25,8 +25,8 @@ dependencies { ...@@ -25,8 +25,8 @@ dependencies {
compile library.java.guava compile library.java.guava
compile library.java.slf4j_api compile library.java.slf4j_api
compile library.java.findbugs_jsr305 compile library.java.findbugs_jsr305
compileOnly library.java.hadoop_common provided library.java.hadoop_common
compileOnly library.java.hadoop_mapreduce_client_core provided library.java.hadoop_mapreduce_client_core
testCompile library.java.hamcrest_all testCompile library.java.hamcrest_all
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-core")
...@@ -35,8 +35,6 @@ dependencies { ...@@ -35,8 +35,6 @@ dependencies {
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version" testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile library.java.junit testCompile library.java.junit
testCompile library.java.mockito_all testCompile library.java.mockito_all
testCompileOnly library.java.hadoop_common
testCompileOnly library.java.hadoop_mapreduce_client_core
} }
task packageTests(type: Jar) { task packageTests(type: Jar) {
......
...@@ -27,8 +27,8 @@ dependencies { ...@@ -27,8 +27,8 @@ dependencies {
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hadoop-parent:beam-sdks-java-io-hadoop-input-format") compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hadoop-parent:beam-sdks-java-io-hadoop-input-format")
compile library.java.slf4j_api compile library.java.slf4j_api
compile group: "org.elasticsearch", name: "elasticsearch-hadoop", version:"5.0.0" compile group: "org.elasticsearch", name: "elasticsearch-hadoop", version:"5.0.0"
compileOnly library.java.hadoop_common provided library.java.hadoop_common
compileOnly library.java.hadoop_mapreduce_client_core provided library.java.hadoop_mapreduce_client_core
runtime library.java.commons_io_2x runtime library.java.commons_io_2x
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common") testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common")
testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common").sourceSets.test.output testCompile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common").sourceSets.test.output
...@@ -46,8 +46,6 @@ dependencies { ...@@ -46,8 +46,6 @@ dependencies {
testCompile "org.apache.logging.log4j:log4j-core:$log4j_version" testCompile "org.apache.logging.log4j:log4j-core:$log4j_version"
testCompile library.java.junit testCompile library.java.junit
testCompile library.java.mockito_all testCompile library.java.mockito_all
testCompileOnly library.java.hadoop_common
testCompileOnly library.java.hadoop_mapreduce_client_core
} }
task packageTests(type: Jar) { task packageTests(type: Jar) {
......
...@@ -24,9 +24,9 @@ dependencies { ...@@ -24,9 +24,9 @@ dependencies {
compile library.java.slf4j_api compile library.java.slf4j_api
compile library.java.guava compile library.java.guava
compile library.java.findbugs_jsr305 compile library.java.findbugs_jsr305
compileOnly library.java.hadoop_common provided library.java.hadoop_common
compileOnly "org.apache.hive:hive-exec:2.1.0" provided "org.apache.hive:hive-exec:2.1.0"
compileOnly(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version:"2.1.0") { provided(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version:"2.1.0") {
exclude(module: "hive-exec") exclude(module: "hive-exec")
exclude(module: "protobuf-java") exclude(module: "protobuf-java")
exclude(module: "jdk.tools") exclude(module: "jdk.tools")
...@@ -39,13 +39,6 @@ dependencies { ...@@ -39,13 +39,6 @@ dependencies {
testCompile "org.apache.hive:hive-exec:2.1.0" testCompile "org.apache.hive:hive-exec:2.1.0"
testCompile "org.apache.hive:hive-common:2.1.0" testCompile "org.apache.hive:hive-common:2.1.0"
testCompile "org.apache.hive:hive-cli:2.1.0" testCompile "org.apache.hive:hive-cli:2.1.0"
testCompileOnly library.java.hadoop_common
testCompileOnly "org.apache.hive:hive-exec:2.1.0"
testCompileOnly(group: "org.apache.hive.hcatalog", name: "hive-hcatalog-core", version:"2.1.0") {
exclude(module: "hive-exec")
exclude(module: "protobuf-java")
exclude(module: "jdk.tools")
}
} }
task packageTests(type: Jar) { task packageTests(type: Jar) {
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册