Skip to content

Commit

Permalink
Simplify sdks/java/harness build
Browse files Browse the repository at this point in the history
This is a noop change, moves things closer to legacy-worker/build.gradle
  • Loading branch information
apilloud committed Nov 21, 2022
1 parent e6e832b commit 928400c
Showing 1 changed file with 8 additions and 22 deletions.
30 changes: 8 additions & 22 deletions sdks/java/harness/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,6 @@

plugins { id 'org.apache.beam.module' }

// We specifically enumerate all the projects that we depend on since
// the list is used in both defining the included set for the uber jar
// and also the set of project level dependencies.
def dependOnShadedProjects = [":model:pipeline", ":model:fn-execution", ":sdks:java:core"]
def dependOnProjects = [":sdks:java:fn-execution",
":runners:core-java", ":runners:core-construction-java"]

applyJavaNature(
classesTriggerCheckerBugs: [
'AssignWindowsRunner': 'https://github.com/typetools/checker-framework/issues/3794',
Expand All @@ -40,12 +33,6 @@ applyJavaNature(
// jars.
{
dependencies {
// Directly include all projects depended on
dependOnProjects.each {
include(project(path: it, configuration: "shadow"))
}
// Include all dependencies and transitive dependencies
include(dependency(".*:.*"))
exclude(dependency(".*:avro:.*"))
}
},
Expand All @@ -55,21 +42,20 @@ description = "Apache Beam :: SDKs :: Java :: Harness"
ext.summary = "This contains the SDK Fn Harness for Beam Java"

dependencies {
dependOnShadedProjects.each {
implementation project(path: it, configuration: "shadow")
}
dependOnProjects.each {
implementation project(it)
}
shadow library.java.vendored_guava_26_0_jre
implementation project(path: ":model:fn-execution", configuration: "shadow")
implementation project(path: ":model:pipeline", configuration: "shadow")
implementation project(path: ":sdks:java:core", configuration: "shadow")
implementation project(":runners:core-construction-java")
implementation project(":runners:core-java")
implementation project(":sdks:java:fn-execution")
implementation library.java.jamm
implementation library.java.joda_time
implementation library.java.slf4j_api
implementation library.java.vendored_grpc_1_48_1
implementation library.java.jamm
shadow library.java.vendored_guava_26_0_jre
testImplementation library.java.junit
testImplementation library.java.mockito_core
testImplementation project(path: ":sdks:java:core", configuration: "shadowTest")
testImplementation project(":runners:core-construction-java")
testImplementation project(path: ":sdks:java:fn-execution", configuration: "testRuntimeMigration")
shadowTestRuntimeClasspath library.java.slf4j_jdk14
}

0 comments on commit 928400c

Please sign in to comment.