Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BEAM-10961] enabled strict dependency on sdks-core and sdks-expansion-service #13685

Merged
merged 8 commits into from
Jan 22, 2021
Merged

[BEAM-10961] enabled strict dependency on sdks-core and sdks-expansion-service #13685

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
970bd2a
enabled strict dependency on sdks-core
sonam-vend Jan 7, 2021
804f453
added jsr dependency
sonam-vend Jan 7, 2021
b36a112
enabled strict depedency on expansion-service-sdks
sonam-vend Jan 7, 2021
b5ec2ef
downgraded xz from 1.8 to 1.5
sonam-vend Jan 7, 2021
e8ae2bb
enable strict dependencies
shehzaadn-vd Jan 20, 2021
867c1e6
Merge branch 'master' of https://github.com/apache/beam into sdks-core
shehzaadn-vd Jan 20, 2021
8427264
resolved requested changes
sonam-vend Jan 22, 2021
96f0062
Use antlr library instead of hard-coding.
ibzib Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdks/java/container/license_scripts/dep_urls_java.yaml
View file
Open in desktop
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"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For sdks:java:container:pullLicenses task to succeed, i had to downgrade xz licence version from 1.8 to 1.5 as suggested by the build scan https://scans.gradle.com/s/2tv254pmdrzxq/console-log?task=:sdks:java:container:pullLicenses

4 changes: 3 additions & 1 deletion sdks/java/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ test {

dependencies {
antlr library.java.antlr
permitUnusedDeclared "org.antlr:antlr4:4.7"
sonam-vend marked this conversation as resolved.
Show resolved Hide resolved
ibzib marked this conversation as resolved.
Show resolved Hide resolved
// 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 @@ -78,14 +79,15 @@ 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"
permitUnusedDeclared "org.tukaani:xz:1.8"
sonam-vend marked this conversation as resolved.
Show resolved Hide resolved
provided library.java.junit
provided library.java.hamcrest_core
provided library.java.hamcrest_library
Expand Down
2 changes: 1 addition & 1 deletion sdks/java/expansion-service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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