Skip to content

Commit 6ee1dac

Browse files
Spark repository artifact support for the dependencies (#337)
## Summary Refactored artifact related functions to be able to specify dependencies from both Maven and Spark repositories as needed. ## Checklist - [ ] Added Unit Tests - [x] Covered by existing CI - [ ] Integration tested - [ ] Documentation update <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - Chores • Excluded a local build configuration file from version control. - Refactor • Standardized and updated dependency declarations across modules to use a Maven-based approach. • Consolidated artifact retrieval logic and centralized repository constants. • Removed outdated functions and refined build rule defaults for improved maintainability. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Piyush Narang <[email protected]>
1 parent d24ae6a commit 6ee1dac

File tree

16 files changed

+155
-135
lines changed

16 files changed

+155
-135
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,7 @@ releases
9595
/project/**/metals.sbt.lock
9696

9797
# Bazel temporary output
98-
/bazel-*
98+
/bazel-*
99+
100+
# Local bazelrc setup
101+
.bazelrc.local

aggregator/BUILD.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ scala_library(
1313
maven_artifact("org.apache.commons:commons-lang3"),
1414
maven_artifact("org.slf4j:slf4j-api"),
1515
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
16-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
16+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
1717
],
1818
)
1919

@@ -31,15 +31,15 @@ test_deps = [
3131
maven_artifact("org.apache.commons:commons-math3"),
3232
maven_artifact("org.scala-lang.modules:scala-collection-compat_2.12"),
3333
# Testing
34-
scala_artifact("org.scalatest:scalatest-matchers-core"),
35-
scala_artifact("org.scalatest:scalatest-core"),
36-
scala_artifact("org.scalatest:scalatest"),
37-
scala_artifact("org.scalatest:scalatest-flatspec"),
38-
scala_artifact("org.scalatest:scalatest-funsuite"),
39-
scala_artifact("org.scalatest:scalatest-shouldmatchers"),
40-
scala_artifact("org.scalactic:scalactic"),
41-
scala_artifact("org.scalatestplus:mockito-3-4"),
42-
scala_artifact("org.mockito:mockito-scala"),
34+
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
35+
maven_scala_artifact("org.scalatest:scalatest-core"),
36+
maven_scala_artifact("org.scalatest:scalatest"),
37+
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
38+
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
39+
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
40+
maven_scala_artifact("org.scalactic:scalactic"),
41+
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
42+
maven_scala_artifact("org.mockito:mockito-scala"),
4343
maven_artifact("org.mockito:mockito-core"),
4444
maven_artifact("org.scalatest:scalatest-compatible"),
4545
maven_artifact("junit:junit"),

api/BUILD.bazel

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ scala_library(
3131
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
3232
maven_artifact("org.apache.commons:commons-lang3"),
3333
maven_artifact("com.google.code.gson:gson"),
34-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
35-
scala_artifact("org.scala-lang.modules:scala-parser-combinators"),
34+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
35+
maven_scala_artifact("org.scala-lang.modules:scala-parser-combinators"),
3636
],
3737
)
3838

@@ -51,10 +51,10 @@ scala_test_suite(
5151
maven_artifact("junit:junit"),
5252
maven_artifact("com.novocode:junit-interface"),
5353
maven_artifact("org.mockito:mockito-core"),
54-
scala_artifact("org.scala-lang.modules:scala-parser-combinators"),
55-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
56-
scala_artifact("org.scalatest:scalatest"),
57-
scala_artifact("org.scalatest:scalatest-flatspec"),
58-
scala_artifact("org.scalatest:scalatest-funsuite"),
54+
maven_scala_artifact("org.scala-lang.modules:scala-parser-combinators"),
55+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
56+
maven_scala_artifact("org.scalatest:scalatest"),
57+
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
58+
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
5959
],
6060
)

cloud_gcp/BUILD.bazel

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ scala_library(
88
"//online:lib",
99
"//spark:lib",
1010
"//tools/build_rules/spark:spark-exec",
11-
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
12-
scala_artifact("org.json4s:json4s-core"),
13-
scala_artifact("org.json4s:json4s-jackson"),
14-
scala_artifact("org.json4s:json4s-ast"),
15-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
16-
scala_artifact("org.rogach:scallop"),
11+
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
12+
maven_scala_artifact("org.json4s:json4s-core"),
13+
maven_scala_artifact("org.json4s:json4s-jackson"),
14+
maven_scala_artifact("org.json4s:json4s-ast"),
15+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
16+
maven_scala_artifact("org.rogach:scallop"),
1717
maven_artifact("com.google.cloud:google-cloud-core"),
1818
maven_artifact("com.google.cloud:google-cloud-bigquery"),
1919
maven_artifact("com.google.cloud:google-cloud-bigtable"),
@@ -22,7 +22,7 @@ scala_library(
2222
maven_artifact("com.google.cloud.bigdataoss:gcsio"),
2323
maven_artifact("com.google.cloud.bigdataoss:util-hadoop"),
2424
maven_artifact("com.google.cloud.hosted.kafka:managed-kafka-auth-login-handler"),
25-
scala_artifact("com.google.cloud.spark:spark-bigquery-with-dependencies"),
25+
maven_scala_artifact("com.google.cloud.spark:spark-bigquery-with-dependencies"),
2626
maven_artifact("com.google.api:api-common"),
2727
maven_artifact("com.google.api.grpc:proto-google-cloud-dataproc-v1"),
2828
maven_artifact("com.google.api:gax"),
@@ -52,8 +52,8 @@ test_deps = [
5252
"//spark:lib",
5353
"//tools/build_rules/spark:spark-exec",
5454
# Libraries
55-
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
56-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
55+
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
56+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
5757
maven_artifact("com.google.cloud:google-cloud-bigquery"),
5858
maven_artifact("com.google.cloud:google-cloud-bigtable"),
5959
maven_artifact("com.google.cloud:google-cloud-dataproc"),
@@ -63,20 +63,20 @@ test_deps = [
6363
maven_artifact("com.google.cloud:google-cloud-bigtable-emulator"),
6464
maven_artifact("com.google.api:api-common"),
6565
maven_artifact("com.google.api.grpc:proto-google-cloud-dataproc-v1"),
66-
scala_artifact("com.google.cloud.spark:spark-bigquery-with-dependencies"),
66+
maven_scala_artifact("com.google.cloud.spark:spark-bigquery-with-dependencies"),
6767
maven_artifact("com.google.api:gax"),
6868
maven_artifact("com.google.protobuf:protobuf-java"),
6969
maven_artifact("org.apache.hadoop:hadoop-client-api"),
7070
# Testing
71-
scala_artifact("org.scalatest:scalatest-matchers-core"),
72-
scala_artifact("org.scalatest:scalatest-core"),
73-
scala_artifact("org.scalatest:scalatest"),
74-
scala_artifact("org.scalatest:scalatest-flatspec"),
75-
scala_artifact("org.scalatest:scalatest-funsuite"),
76-
scala_artifact("org.scalatest:scalatest-shouldmatchers"),
77-
scala_artifact("org.scalactic:scalactic"),
78-
scala_artifact("org.scalatestplus:mockito-3-4"),
79-
scala_artifact("org.mockito:mockito-scala"),
71+
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
72+
maven_scala_artifact("org.scalatest:scalatest-core"),
73+
maven_scala_artifact("org.scalatest:scalatest"),
74+
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
75+
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
76+
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
77+
maven_scala_artifact("org.scalactic:scalactic"),
78+
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
79+
maven_scala_artifact("org.mockito:mockito-scala"),
8080
maven_artifact("org.mockito:mockito-core"),
8181
maven_artifact("org.scalatest:scalatest-compatible"),
8282
maven_artifact("junit:junit"),

flink/BUILD.bazel

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ scala_library(
88
"//api:thrift_java",
99
"//online:lib",
1010
"//tools/build_rules/spark:spark-exec",
11-
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
12-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
13-
scala_artifact("org.rogach:scallop"),
11+
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
12+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
13+
maven_scala_artifact("org.rogach:scallop"),
1414
maven_artifact("io.dropwizard.metrics:metrics-core"),
1515
maven_artifact("org.apache.kafka:kafka-clients"),
1616
maven_artifact("org.slf4j:slf4j-api"),
@@ -31,8 +31,8 @@ test_deps = _FLINK_TEST_DEPS + [
3131
"//aggregator:lib",
3232
"//tools/build_rules/spark:spark-exec",
3333
# Libraries
34-
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
35-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
34+
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
35+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
3636
maven_artifact("org.slf4j:slf4j-api"),
3737
maven_artifact("org.apache.logging.log4j:log4j-api"),
3838
maven_artifact("org.apache.logging.log4j:log4j-core"),
@@ -42,15 +42,15 @@ test_deps = _FLINK_TEST_DEPS + [
4242
maven_artifact("io.confluent:kafka-protobuf-provider"),
4343
maven_artifact("org.apache.kafka:kafka-clients"),
4444
# Testing
45-
scala_artifact("org.scalatest:scalatest-matchers-core"),
46-
scala_artifact("org.scalatest:scalatest-core"),
47-
scala_artifact("org.scalatest:scalatest"),
48-
scala_artifact("org.scalatest:scalatest-flatspec"),
49-
scala_artifact("org.scalatest:scalatest-funsuite"),
50-
scala_artifact("org.scalatest:scalatest-shouldmatchers"),
51-
scala_artifact("org.scalactic:scalactic"),
52-
scala_artifact("org.scalatestplus:mockito-3-4"),
53-
scala_artifact("org.mockito:mockito-scala"),
45+
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
46+
maven_scala_artifact("org.scalatest:scalatest-core"),
47+
maven_scala_artifact("org.scalatest:scalatest"),
48+
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
49+
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
50+
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
51+
maven_scala_artifact("org.scalactic:scalactic"),
52+
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
53+
maven_scala_artifact("org.mockito:mockito-scala"),
5454
maven_artifact("org.mockito:mockito-core"),
5555
maven_artifact("org.scalatest:scalatest-compatible"),
5656
maven_artifact("junit:junit"),

hub/BUILD.bazel

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ scala_library(
88
"//online:lib",
99
"//service_commons:lib",
1010
"//spark:lib",
11-
scala_artifact("org.typelevel:cats-core"),
12-
scala_artifact("com.chuusai:shapeless"),
13-
scala_artifact("org.json4s:json4s-core"),
14-
scala_artifact("org.json4s:json4s-jackson"),
15-
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
16-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
11+
maven_scala_artifact("org.typelevel:cats-core"),
12+
maven_scala_artifact("com.chuusai:shapeless"),
13+
maven_scala_artifact("org.json4s:json4s-core"),
14+
maven_scala_artifact("org.json4s:json4s-jackson"),
15+
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
16+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
1717
maven_artifact("ch.qos.logback:logback-classic"),
1818
maven_artifact("org.slf4j:slf4j-api"),
1919
maven_artifact("com.typesafe:config"),
@@ -31,20 +31,20 @@ test_deps = _VERTX_TEST_DEPS + _CIRCE_DEPS + [
3131
"//spark:lib",
3232
"//service_commons:lib",
3333
# Libraries
34-
scala_artifact("org.typelevel:cats-core"),
35-
scala_artifact("com.chuusai:shapeless"),
36-
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
37-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
34+
maven_scala_artifact("org.typelevel:cats-core"),
35+
maven_scala_artifact("com.chuusai:shapeless"),
36+
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
37+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
3838
# Testing
39-
scala_artifact("org.scalatest:scalatest-matchers-core"),
40-
scala_artifact("org.scalatest:scalatest-core"),
41-
scala_artifact("org.scalatest:scalatest"),
42-
scala_artifact("org.scalatest:scalatest-flatspec"),
43-
scala_artifact("org.scalatest:scalatest-funsuite"),
44-
scala_artifact("org.scalatest:scalatest-shouldmatchers"),
45-
scala_artifact("org.scalactic:scalactic"),
46-
scala_artifact("org.scalatestplus:mockito-3-4"),
47-
scala_artifact("org.mockito:mockito-scala"),
39+
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
40+
maven_scala_artifact("org.scalatest:scalatest-core"),
41+
maven_scala_artifact("org.scalatest:scalatest"),
42+
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
43+
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
44+
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
45+
maven_scala_artifact("org.scalactic:scalactic"),
46+
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
47+
maven_scala_artifact("org.mockito:mockito-scala"),
4848
maven_artifact("org.mockito:mockito-core"),
4949
maven_artifact("org.scalatest:scalatest-compatible"),
5050
maven_artifact("junit:junit"),

online/BUILD.bazel

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@ scala_library(
77
"//api:lib",
88
"//api:thrift_java",
99
"//tools/build_rules/spark:spark-exec",
10-
scala_artifact("org.scala-lang.modules:scala-java8-compat"),
11-
scala_artifact("org.json4s:json4s-core"),
12-
scala_artifact("org.json4s:json4s-jackson"),
13-
scala_artifact("org.json4s:json4s-ast"),
14-
scala_artifact("org.scala-lang.modules:scala-collection-compat"),
10+
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
11+
maven_scala_artifact("org.json4s:json4s-core"),
12+
maven_scala_artifact("org.json4s:json4s-jackson"),
13+
maven_scala_artifact("org.json4s:json4s-ast"),
14+
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
1515
maven_artifact("com.datadoghq:java-dogstatsd-client"),
16-
scala_artifact("org.rogach:scallop"),
16+
maven_scala_artifact("org.rogach:scallop"),
1717
maven_artifact("net.jodah:typetools"),
1818
maven_artifact("com.github.ben-manes.caffeine:caffeine"),
1919
maven_artifact("com.fasterxml.jackson.core:jackson-core"),
2020
maven_artifact("com.fasterxml.jackson.core:jackson-databind"),
21-
scala_artifact("com.fasterxml.jackson.module:jackson-module-scala"),
22-
scala_artifact("com.softwaremill.sttp.client3:core"),
23-
scala_artifact("com.softwaremill.sttp.model:core"),
24-
scala_artifact("com.softwaremill.sttp.shared:core"),
21+
maven_scala_artifact("com.fasterxml.jackson.module:jackson-module-scala"),
22+
maven_scala_artifact("com.softwaremill.sttp.client3:core"),
23+
maven_scala_artifact("com.softwaremill.sttp.model:core"),
24+
maven_scala_artifact("com.softwaremill.sttp.shared:core"),
2525
maven_artifact("org.slf4j:slf4j-api"),
2626
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
2727
maven_artifact("com.google.code.gson:gson"),
@@ -44,15 +44,15 @@ test_deps = [
4444
maven_artifact("com.google.code.gson:gson"),
4545
maven_artifact("org.apache.hive:hive-exec"),
4646
# Testing
47-
scala_artifact("org.scalatest:scalatest-matchers-core"),
48-
scala_artifact("org.scalatest:scalatest-core"),
49-
scala_artifact("org.scalatest:scalatest"),
50-
scala_artifact("org.scalatest:scalatest-flatspec"),
51-
scala_artifact("org.scalatest:scalatest-funsuite"),
52-
scala_artifact("org.scalatest:scalatest-shouldmatchers"),
53-
scala_artifact("org.scalactic:scalactic"),
54-
scala_artifact("org.scalatestplus:mockito-3-4"),
55-
scala_artifact("org.mockito:mockito-scala"),
47+
maven_scala_artifact("org.scalatest:scalatest-matchers-core"),
48+
maven_scala_artifact("org.scalatest:scalatest-core"),
49+
maven_scala_artifact("org.scalatest:scalatest"),
50+
maven_scala_artifact("org.scalatest:scalatest-flatspec"),
51+
maven_scala_artifact("org.scalatest:scalatest-funsuite"),
52+
maven_scala_artifact("org.scalatest:scalatest-shouldmatchers"),
53+
maven_scala_artifact("org.scalactic:scalactic"),
54+
maven_scala_artifact("org.scalatestplus:mockito-3-4"),
55+
maven_scala_artifact("org.mockito:mockito-scala"),
5656
maven_artifact("org.mockito:mockito-core"),
5757
maven_artifact("org.scalatest:scalatest-compatible"),
5858
maven_artifact("junit:junit"),

orchestration/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ scala_library(
66
"//api:lib",
77
"//api:thrift_java",
88
"//online:lib",
9-
scala_artifact("org.apache.logging.log4j:log4j-api-scala"),
9+
maven_scala_artifact("org.apache.logging.log4j:log4j-api-scala"),
1010
maven_artifact("org.apache.logging.log4j:log4j-core"),
1111
maven_artifact("org.apache.logging.log4j:log4j-api"),
1212
],
@@ -19,7 +19,7 @@ test_deps = [
1919
"//online:lib",
2020
"//service_commons:lib",
2121
# Libraries
22-
scala_artifact("org.apache.logging.log4j:log4j-api-scala"),
22+
maven_scala_artifact("org.apache.logging.log4j:log4j-api-scala"),
2323
maven_artifact("org.apache.logging.log4j:log4j-core"),
2424
maven_artifact("org.apache.logging.log4j:log4j-api"),
2525
]

service/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ java_library(
1414
maven_artifact("com.fasterxml.jackson.core:jackson-core"),
1515
maven_artifact("com.fasterxml.jackson.core:jackson-databind"),
1616
maven_artifact("org.slf4j:slf4j-api"),
17-
scala_artifact("org.json4s:json4s-core"),
17+
maven_scala_artifact("org.json4s:json4s-core"),
1818
],
1919
)
2020

0 commit comments

Comments
 (0)