Skip to content

Commit

Permalink
[BEAM-10961] enabled strict dependency on sdks-core and sdks-expansio…
Browse files Browse the repository at this point in the history
…n-service (#13685)

* enabled strict dependency on sdks-core

* added jsr dependency

* enabled strict depedency on expansion-service-sdks

* downgraded xz from 1.8 to 1.5

* enable strict dependencies

* resolved requested changes

* Use antlr library instead of hard-coding.

Co-authored-by: Shehzaad Nakhoda <shehzaad@venturedive.com>
Co-authored-by: Kyle Weaver <kcweaver@google.com>
  • Loading branch information
3 people committed Jan 22, 2021
1 parent 4141550 commit 5d58250
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions sdks/java/container/license_scripts/dep_urls_java.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ paranamer:
'2.7':
license: "https://raw.githubusercontent.com/paul-hammant/paranamer/master/LICENSE.txt"
xz:
'1.8':
license: "https://git.tukaani.org/?p=xz-java.git;a=blob_plain;f=COPYING;h=c1d404dc7a6f06a0437bf1055fedaa4a4c89d728;hb=HEAD"
'1.5':
license: "https://git.tukaani.org/?p=xz-java.git;a=blob;f=COPYING;h=c1d404dc7a6f06a0437bf1055fedaa4a4c89d728;hb=9f1f97a26f090ffec6568c004a38c6534aa82b94"
5 changes: 4 additions & 1 deletion sdks/java/core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

plugins { id 'org.apache.beam.module' }
applyJavaNature(
enableStrictDependencies: true,
automaticModuleName: 'org.apache.beam.sdk',
classesTriggerCheckerBugs: [
'DoFnTester': 'https://github.com/typetools/checker-framework/issues/3776',
Expand Down Expand Up @@ -71,6 +72,8 @@ test {

dependencies {
antlr library.java.antlr
// antlr is used to generate code from sdks/java/core/src/main/antlr/
permitUnusedDeclared library.java.antlr
// Required to load constants from the model, e.g. max timestamp for global window
shadow project(path: ":model:pipeline", configuration: "shadow")
shadow project(path: ":model:job-management", configuration: "shadow")
Expand All @@ -81,14 +84,14 @@ dependencies {
compile library.java.commons_compress
compile library.java.commons_lang3
shadow library.java.jsr305
shadow library.java.error_prone_annotations
shadow library.java.jackson_core
shadow library.java.jackson_annotations
shadow library.java.jackson_databind
shadow library.java.slf4j_api
shadow library.java.avro
shadow library.java.snappy_java
shadow library.java.joda_time
shadow "org.tukaani:xz:1.8"
provided library.java.junit
provided library.java.hamcrest_core
provided library.java.hamcrest_library
Expand Down
3 changes: 2 additions & 1 deletion sdks/java/expansion-service/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

plugins { id 'org.apache.beam.module' }
applyJavaNature(
enableStrictDependencies: true,
automaticModuleName: 'org.apache.beam.sdk.expansion.service')

description = "Apache Beam :: SDKs :: Java :: Expansion Service"
Expand All @@ -34,7 +35,7 @@ test {

dependencies {
compile project(path: ":model:pipeline", configuration: "shadow")
compile project(path: ":model:fn-execution", configuration: "shadow")
compile project(path: ":model:job-management", configuration: "shadow")
compile project(path: ":sdks:java:core", configuration: "shadow")
compile project(path: ":runners:core-construction-java")
compile project(path: ":runners:java-fn-execution")
Expand Down

0 comments on commit 5d58250

Please sign in to comment.