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

Get evaluation dependency order fixed because of dependency on sourceSets.test.output in builds

上级 ee39a571
No related branches found
No related tags found
无相关合并请求
显示
186 个添加130 个删除
......@@ -16,6 +16,8 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
def google_cloud_bigdataoss_version = "1.4.5"
def bigtable_version = "1.0.0-pre3"
def google_clients_version = "1.22.0"
......@@ -130,42 +132,13 @@ ext.library = [
],
]
/** Used as configuration within the applyJavaNature closure. */
class JavaNatureConfiguration {
double javaVersion = 1.7
}
allprojects {
group = "org.apache.beam"
version = "2.3.0-SNAPSHOT"
// Define the default set of properties
repositories {
mavenLocal()
mavenCentral()
jcenter()
maven { url "https://oss.sonatype.org/content/repositories/staging/" }
maven { url "https://repository.apache.org/snapshots" }
maven { url "https://repository.apache.org/content/repositories/releases" }
}
// Add a task "allDeps" which lists all dependencies of the project
// and all subprojects.
task allDeps(type: DependencyReportTask) {
}
}
buildscript {
repositories {
mavenLocal()
mavenCentral()
jcenter()
maven {
url "https://plugins.gradle.org/m2/"
}
maven {
url "http://repo.spring.io/plugins-release"
}
maven { url "https://plugins.gradle.org/m2/" }
maven { url "http://repo.spring.io/plugins-release" }
}
dependencies {
classpath "net.ltgt.gradle:gradle-apt-plugin:0.12"
......@@ -178,6 +151,8 @@ buildscript {
}
}
apply plugin: "base"
// Apply one top level rat plugin to perform any required analysis
apply plugin: "org.nosphere.apache.rat"
rat {
......@@ -257,102 +232,4 @@ rat {
"**/go/pkg/beam/model/**/*.pb.go",
]
}
//check.dependsOn rat
configure(allprojects) {
apply from: project(":").file("build_rules.gradle")
}
// Configure Java 7 projects
configure([
project(":beam-model-parent:beam-model-pipeline"),
project(":beam-model-parent:beam-model-job-management"),
project(":beam-model-parent:beam-model-fn-execution"),
project(":beam-sdks-java-build-tools"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-amqp"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-cassandra"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-common"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-elasticsearch"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-elasticsearch-tests-parent:beam-sdks-java-io-elasticsearch-tests-common"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-elasticsearch-tests-parent:beam-sdks-java-io-elasticsearch-tests-2"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-elasticsearch-tests-parent:beam-sdks-java-io-elasticsearch-tests-5"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-google-cloud-platform"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hadoop-common"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hadoop-file-system"),
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"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hadoop-parent:beam-sdks-java-io-hadoop-jdk1.8-tests"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hbase"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-hcatalog"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-jdbc"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-jms"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-kafka"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-kinesis"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-mongodb"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-mqtt"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-redis"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-solr"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-tika"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-xml"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-maven-archetypes-parent:beam-sdks-java-maven-archetypes-starter"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-maven-archetypes-parent:beam-sdks-java-maven-archetypes-examples"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-google-cloud-platform-core"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-json-jackson"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-join-library"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-protobuf"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-sorter"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-sql"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-nexmark"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-harness"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-container"),
project(":beam-runners-parent:beam-runners-core-construction-java"),
project(":beam-runners-parent:beam-runners-core-java"),
project(":beam-runners-parent:beam-local-artifact-service-java"),
project(":beam-runners-parent:beam-runners-reference-parent:beam-runners-reference-job-orchestrator"),
project(":beam-runners-parent:beam-runners-direct-java"),
project(":beam-runners-parent:beam-runners-flink_2.10"),
project(":beam-runners-parent:beam-runners-google-cloud-dataflow-java"),
project(":beam-runners-parent:beam-runners-spark"),
project(":beam-runners-parent:beam-runners-apex"),
project(":beam-runners-parent:beam-runners-gcp-parent:beam-runners-gcp-gcemd"),
project(":beam-runners-parent:beam-runners-gcp-parent:beam-runners-gcp-gcsproxy"),
project(":beam-runners-parent:beam-runners-gearpump"),
project(":beam-examples-parent:beam-examples-java"),
project(":beam-sdks-java-javadoc"),
]) {
applyJavaNature()
}
// Configure Java 8 projects
configure([
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-maven-archetypes-parent:beam-sdks-java-maven-archetypes-examples-java8"),
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-java8tests"),
project(":beam-examples-parent:beam-examples-java8"),
]) {
applyJavaNature(javaVersion: 1.8)
}
// Configure Go projects
configure([
project(":beam-sdks-parent:beam-sdks-go"),
]) {
applyGoNature()
}
// Configure Avro code generation projects
configure([
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core"),
]) {
applyAvroNature()
}
// Configure protobuf/gRPC code generation projects
configure([
project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-protobuf"),
project(":beam-model-parent:beam-model-pipeline"),
project(":beam-model-parent:beam-model-job-management"),
project(":beam-model-parent:beam-model-fn-execution"),
]) {
applyGrpcNature()
}
check.dependsOn rat
......@@ -18,6 +18,39 @@
println "Applying build_rules.gradle to $project.name"
/*************************************************************************************************/
// Apply common properties/repositories and tasks to all builds.
group = "org.apache.beam"
version = "2.3.0-SNAPSHOT"
// Add a task "allDeps" which lists all dependencies of the project
// and all subprojects.
task allD
// Define the default set of properties
repositories {
mavenLocal()
mavenCentral()
jcenter()
// Release staging repository
maven { url "https://oss.sonatype.org/content/repositories/staging/" }
// Apache nightly snapshots
maven { url "https://repository.apache.org/snapshots" }
// Apache release snapshots
maven { url "https://repository.apache.org/content/repositories/releases" }
}
// Add a task "allDeps" which lists all dependencies of the project
// and all subprojects.
task allDeps(type: DependencyReportTask) {
}
/*************************************************************************************************/
/** Used as configuration within the applyJavaNature closure. */
class JavaNatureConfiguration {
double javaVersion = 1.7
......
......@@ -16,8 +16,20 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Examples :: Java"
/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
* TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-google-cloud-platform")
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-extensions-parent:beam-sdks-java-extensions-google-cloud-platform-core")
......
......@@ -16,6 +16,9 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature(javaVersion: 1.8)
description = "Apache Beam :: Examples :: Java 8"
dependencies {
......
################################################################################
# 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.
################################################################################
org.gradle.parallel=true
......@@ -16,6 +16,10 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
applyGrpcNature()
description = "Apache Beam :: Model :: Fn Execution"
dependencies {
......
......@@ -16,6 +16,10 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
applyGrpcNature()
description = "Apache Beam :: Model :: Job Management"
dependencies {
......
......@@ -16,6 +16,10 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
applyGrpcNature()
description = "Apache Beam :: Model :: Pipeline"
dependencies {
......
......@@ -16,8 +16,22 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Apex"
/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
* TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
evaluationDependsOn(":beam-runners-parent:beam-runners-core-java")
dependencies {
compile project(":beam-model-parent:beam-model-pipeline")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
......
......@@ -16,6 +16,9 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Core Construction Java"
dependencies {
......
......@@ -16,8 +16,20 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Core Java"
/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
* TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
dependencies {
compile project(":beam-model-parent:beam-model-pipeline")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
......
......@@ -16,8 +16,22 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Direct Java"
/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
* TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
evaluationDependsOn(":beam-runners-parent:beam-runners-core-java")
evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
dependencies {
compile project(":beam-model-parent:beam-model-pipeline")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
......
......@@ -16,8 +16,22 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Flink"
/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
* TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
evaluationDependsOn(":beam-runners-parent:beam-runners-core-java")
def flink_version = "1.3.0"
dependencies {
......
......@@ -16,6 +16,9 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature(javaVersion: 1.8)
description = "Apache Beam :: Runners :: Gearpump"
def gearpump_version = "0.8.4"
......
......@@ -16,8 +16,23 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Google Cloud Dataflow"
/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
* TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-io-parent:beam-sdks-java-io-google-cloud-platform")
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-extensions-parent:beam-sdks-java-extensions-google-cloud-platform-core")
evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
dependencies {
compile project(":beam-model-parent:beam-model-pipeline")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
......
......@@ -16,6 +16,9 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Java Local Artifact Service"
dependencies {
......
......@@ -16,6 +16,9 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Reference :: Job Orchestrator"
dependencies {
......
......@@ -16,8 +16,22 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: Runners :: Spark"
/*
* We need to rely on manually specifying these evaluationDependsOn to ensure that
* the following projects are evaluated before we evaluate this project. This is because
* we are attempting to reference the "sourceSets.test.output" directly.
* TODO: Swap to generating test artifacts which we can then rely on instead of
* the test outputs directly.
*/
evaluationDependsOn(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
evaluationDependsOn(":beam-model-parent:beam-model-fn-execution")
evaluationDependsOn(":beam-runners-parent:beam-runners-core-java")
dependencies {
compile project(":beam-model-parent:beam-model-pipeline")
compile project(":beam-sdks-parent:beam-sdks-java-parent:beam-sdks-java-core")
......
......@@ -16,6 +16,9 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyGoNature()
description = "Apache Beam :: SDKs :: Go"
golang {
......
......@@ -16,6 +16,9 @@
* limitations under the License.
*/
apply from: project(":").file("build_rules.gradle")
applyJavaNature()
description = "Apache Beam :: SDKs :: Java :: Build Tools"
task packageTests(type: Jar) {
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册