Skip to content

Commit 7da358c

Browse files
authored
unified all artifacts to a single maven repository with pinned versions (#490)
## Summary Unified all artifacts in to our single maven repository with pinned versions expect for the 2 scala library artifacts whose versions need to be determined dynamically based on config and cannot be pinned. This should help with dependency conflicts across repos (mainly for maven and spark we saw previously) ## 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** - Streamlined internal build processes by consolidating dependency management and updating repository configurations. - Removed outdated dependency references to ensure a more consistent and reliable build system. - **Refactor** - Adopted a unified Maven-based approach for artifact resolution, enhancing version management across multiple components. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent e965129 commit 7da358c

22 files changed

+12060
-12566
lines changed

WORKSPACE

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44

55
# Load scala version from the config
66
load("//:scala_config.bzl", "scala_version")
7+
78
scala_version(name = "scala_config")
9+
810
load("@scala_config//:version.bzl", "SCALA_VERSION")
911

1012
# Contains useful bazel utility functions and rules
@@ -76,21 +78,28 @@ http_archive(
7678

7779
# Initialize Scala with specific version support
7880
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
81+
7982
scala_config(scala_version = SCALA_VERSION)
8083

8184
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
85+
8286
scala_repositories()
8387

8488
load("@io_bazel_rules_scala//scala:toolchains.bzl", "scala_register_toolchains")
89+
8590
scala_register_toolchains()
8691

8792
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
93+
8894
scalatest_repositories()
95+
8996
scalatest_toolchain()
9097

9198
# For scalafmt
9299
load("@io_bazel_rules_scala//scala/scalafmt:scalafmt_repositories.bzl", "scalafmt_default_config", "scalafmt_repositories")
100+
93101
scalafmt_default_config()
102+
94103
scalafmt_repositories()
95104

96105
# For Protobuf support
@@ -111,10 +120,9 @@ rules_proto_toolchains()
111120

112121
# To load all dependencies used across our modules
113122
load("//tools/build_rules/dependencies:load_dependencies.bzl", "load_all_dependencies")
123+
114124
load_all_dependencies()
115125

116126
load("@maven//:defs.bzl", pinned_maven_repo_install = "pinned_maven_install")
117-
pinned_maven_repo_install()
118127

119-
load("@spark//:defs.bzl", pinned_spark_repo_install = "pinned_maven_install")
120-
pinned_spark_repo_install()
128+
pinned_maven_repo_install()

aggregator/BUILD.bazel

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ scala_library(
1717
maven_artifact("org.apache.commons:commons-lang3"),
1818
maven_artifact("org.slf4j:slf4j-api"),
1919
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
20-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
20+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
2121
],
2222
)
2323

@@ -33,19 +33,19 @@ test_deps = [
3333
maven_artifact("org.apache.datasketches:datasketches-java"),
3434
maven_artifact("org.apache.commons:commons-lang3"),
3535
maven_artifact("org.apache.commons:commons-math3"),
36-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
36+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
3737
# Testing
38-
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
39-
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
40-
scala_artifact_with_suffix("org.scalatest:scalatest"),
41-
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
42-
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
43-
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
44-
scala_artifact_with_suffix("org.scalactic:scalactic"),
45-
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
46-
scala_artifact_with_suffix("org.mockito:mockito-scala"),
38+
maven_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
39+
maven_artifact_with_suffix("org.scalatest:scalatest-core"),
40+
maven_artifact_with_suffix("org.scalatest:scalatest"),
41+
maven_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
42+
maven_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
43+
maven_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
44+
maven_artifact_with_suffix("org.scalactic:scalactic"),
45+
maven_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
46+
maven_artifact_with_suffix("org.mockito:mockito-scala"),
4747
maven_artifact("org.mockito:mockito-core"),
48-
scala_artifact("org.scalatest:scalatest-compatible"),
48+
maven_artifact("org.scalatest:scalatest-compatible"),
4949
maven_artifact("junit:junit"),
5050
maven_artifact("com.novocode:junit-interface"),
5151
]

api/BUILD.bazel

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ scala_library(
3838
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
3939
maven_artifact("org.apache.commons:commons-lang3"),
4040
maven_artifact("com.google.code.gson:gson"),
41-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
42-
scala_artifact_with_suffix("org.scala-lang.modules:scala-parser-combinators"),
41+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
42+
maven_artifact_with_suffix("org.scala-lang.modules:scala-parser-combinators"),
4343
],
4444
)
4545

@@ -53,19 +53,19 @@ test_deps = [
5353
maven_artifact("org.slf4j:slf4j-api"),
5454
maven_artifact("org.apache.logging.log4j:log4j-slf4j-impl"),
5555
# Testing
56-
scala_artifact_with_suffix("org.scala-lang.modules:scala-parser-combinators"),
57-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
58-
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
59-
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
60-
scala_artifact_with_suffix("org.scalatest:scalatest"),
61-
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
62-
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
63-
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
64-
scala_artifact_with_suffix("org.scalactic:scalactic"),
65-
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
66-
scala_artifact_with_suffix("org.mockito:mockito-scala"),
56+
maven_artifact_with_suffix("org.scala-lang.modules:scala-parser-combinators"),
57+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
58+
maven_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
59+
maven_artifact_with_suffix("org.scalatest:scalatest-core"),
60+
maven_artifact_with_suffix("org.scalatest:scalatest"),
61+
maven_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
62+
maven_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
63+
maven_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
64+
maven_artifact_with_suffix("org.scalactic:scalactic"),
65+
maven_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
66+
maven_artifact_with_suffix("org.mockito:mockito-scala"),
6767
maven_artifact("org.mockito:mockito-core"),
68-
scala_artifact("org.scalatest:scalatest-compatible"),
68+
maven_artifact("org.scalatest:scalatest-compatible"),
6969
maven_artifact("junit:junit"),
7070
maven_artifact("com.novocode:junit-interface"),
7171
]

cloud_aws/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ shared_libs = [
1111
maven_artifact("junit:junit"),
1212
maven_artifact("com.novocode:junit-interface"),
1313
maven_artifact("com.fasterxml.jackson.module:jackson-module-afterburner"),
14-
scala_artifact_with_suffix("org.apache.hudi:hudi-spark3.5-bundle"),
15-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
14+
maven_artifact_with_suffix("org.apache.hudi:hudi-spark3.5-bundle"),
15+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
1616
"//api:lib",
1717
"//api:thrift_java",
1818
"//online:lib",
@@ -37,9 +37,9 @@ test_deps = [
3737
maven_artifact("software.amazon.awssdk:auth"),
3838
maven_artifact("software.amazon.awssdk:identity-spi"),
3939
maven_artifact("software.amazon.awssdk:url-connection-client"),
40-
scala_artifact_with_suffix("com.chuusai:shapeless"),
41-
scala_artifact_with_suffix("org.typelevel:cats-core"),
42-
scala_artifact_with_suffix("org.mockito:mockito-scala"),
40+
maven_artifact_with_suffix("com.chuusai:shapeless"),
41+
maven_artifact_with_suffix("org.typelevel:cats-core"),
42+
maven_artifact_with_suffix("org.mockito:mockito-scala"),
4343
] + _CIRCE_DEPS + _SCALA_TEST_DEPS
4444

4545
scala_test_suite(

cloud_gcp/BUILD.bazel

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ shared_deps = [
55
"//online:lib",
66
"//spark:lib",
77
"//tools/build_rules/spark:spark-exec",
8-
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
9-
scala_artifact_with_suffix("org.json4s:json4s-core"),
10-
scala_artifact_with_suffix("org.json4s:json4s-jackson"),
11-
scala_artifact_with_suffix("org.json4s:json4s-ast"),
12-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
13-
scala_artifact_with_suffix("org.rogach:scallop"),
8+
maven_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
9+
maven_artifact_with_suffix("org.json4s:json4s-core"),
10+
maven_artifact_with_suffix("org.json4s:json4s-jackson"),
11+
maven_artifact_with_suffix("org.json4s:json4s-ast"),
12+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
13+
maven_artifact_with_suffix("org.rogach:scallop"),
1414
maven_artifact("com.google.cloud:google-cloud-core"),
1515
maven_artifact("com.google.cloud:google-cloud-bigquery"),
1616
maven_artifact("com.google.cloud:google-cloud-bigtable"),
@@ -35,7 +35,7 @@ shared_deps = [
3535
maven_artifact("org.threeten:threetenbp"),
3636
maven_artifact("org.apache.kafka:kafka-clients"),
3737
maven_artifact("com.google.cloud.spark:spark-3.5-bigquery"),
38-
scala_artifact_with_suffix("org.apache.iceberg:iceberg-spark-runtime-3.5"),
38+
maven_artifact_with_suffix("org.apache.iceberg:iceberg-spark-runtime-3.5"),
3939
maven_artifact("org.objenesis:objenesis"),
4040
]
4141

@@ -54,17 +54,17 @@ test_deps = [
5454
maven_artifact("com.google.cloud:google-cloud-bigtable-emulator"),
5555

5656
# Testing
57-
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
58-
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
59-
scala_artifact_with_suffix("org.scalatest:scalatest"),
60-
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
61-
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
62-
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
63-
scala_artifact_with_suffix("org.scalactic:scalactic"),
64-
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
65-
scala_artifact_with_suffix("org.mockito:mockito-scala"),
57+
maven_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
58+
maven_artifact_with_suffix("org.scalatest:scalatest-core"),
59+
maven_artifact_with_suffix("org.scalatest:scalatest"),
60+
maven_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
61+
maven_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
62+
maven_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
63+
maven_artifact_with_suffix("org.scalactic:scalactic"),
64+
maven_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
65+
maven_artifact_with_suffix("org.mockito:mockito-scala"),
6666
maven_artifact("org.mockito:mockito-core"),
67-
scala_artifact("org.scalatest:scalatest-compatible"),
67+
maven_artifact("org.scalatest:scalatest-compatible"),
6868
maven_artifact("junit:junit"),
6969
maven_artifact("com.novocode:junit-interface"),
7070
]

flink/BUILD.bazel

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ scala_library(
1212
"//api:thrift_java",
1313
"//online:lib",
1414
"//tools/build_rules/spark:spark-exec",
15-
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
16-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
17-
scala_artifact_with_suffix("org.rogach:scallop"),
15+
maven_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
16+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
17+
maven_artifact_with_suffix("org.rogach:scallop"),
1818
maven_artifact("io.dropwizard.metrics:metrics-core"),
1919
maven_artifact("org.apache.kafka:kafka-clients"),
2020
maven_artifact("org.slf4j:slf4j-api"),
@@ -38,8 +38,8 @@ test_deps = _FLINK_TEST_DEPS + [
3838
"//aggregator:lib",
3939
"//tools/build_rules/spark:spark-exec",
4040
# Libraries
41-
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
42-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
41+
maven_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
42+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
4343
maven_artifact("org.slf4j:slf4j-api"),
4444
maven_artifact("org.apache.logging.log4j:log4j-api"),
4545
maven_artifact("org.apache.logging.log4j:log4j-core"),
@@ -52,17 +52,17 @@ test_deps = _FLINK_TEST_DEPS + [
5252
maven_artifact("org.apache.hadoop:hadoop-common"),
5353
maven_artifact("org.apache.hadoop:hadoop-client-api"),
5454
# Testing
55-
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
56-
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
57-
scala_artifact_with_suffix("org.scalatest:scalatest"),
58-
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
59-
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
60-
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
61-
scala_artifact_with_suffix("org.scalactic:scalactic"),
62-
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
63-
scala_artifact_with_suffix("org.mockito:mockito-scala"),
55+
maven_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
56+
maven_artifact_with_suffix("org.scalatest:scalatest-core"),
57+
maven_artifact_with_suffix("org.scalatest:scalatest"),
58+
maven_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
59+
maven_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
60+
maven_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
61+
maven_artifact_with_suffix("org.scalactic:scalactic"),
62+
maven_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
63+
maven_artifact_with_suffix("org.mockito:mockito-scala"),
6464
maven_artifact("org.mockito:mockito-core"),
65-
scala_artifact("org.scalatest:scalatest-compatible"),
65+
maven_artifact("org.scalatest:scalatest-compatible"),
6666
maven_artifact("junit:junit"),
6767
maven_artifact("com.novocode:junit-interface"),
6868
]

hub/BUILD.bazel

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ scala_library(
1212
"//online:lib",
1313
"//service_commons:lib",
1414
"//spark:lib",
15-
scala_artifact_with_suffix("org.typelevel:cats-core"),
16-
scala_artifact_with_suffix("com.chuusai:shapeless"),
17-
scala_artifact_with_suffix("org.json4s:json4s-core"),
18-
scala_artifact_with_suffix("org.json4s:json4s-jackson"),
19-
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
20-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
15+
maven_artifact_with_suffix("org.typelevel:cats-core"),
16+
maven_artifact_with_suffix("com.chuusai:shapeless"),
17+
maven_artifact_with_suffix("org.json4s:json4s-core"),
18+
maven_artifact_with_suffix("org.json4s:json4s-jackson"),
19+
maven_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
20+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
2121
maven_artifact("ch.qos.logback:logback-classic"),
2222
maven_artifact("org.slf4j:slf4j-api"),
2323
maven_artifact("com.typesafe:config"),
@@ -35,22 +35,22 @@ test_deps = _VERTX_TEST_DEPS + _CIRCE_DEPS + [
3535
"//spark:lib",
3636
"//service_commons:lib",
3737
# Libraries
38-
scala_artifact_with_suffix("org.typelevel:cats-core"),
39-
scala_artifact_with_suffix("com.chuusai:shapeless"),
40-
scala_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
41-
scala_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
38+
maven_artifact_with_suffix("org.typelevel:cats-core"),
39+
maven_artifact_with_suffix("com.chuusai:shapeless"),
40+
maven_artifact_with_suffix("org.scala-lang.modules:scala-java8-compat"),
41+
maven_artifact_with_suffix("org.scala-lang.modules:scala-collection-compat"),
4242
# Testing
43-
scala_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
44-
scala_artifact_with_suffix("org.scalatest:scalatest-core"),
45-
scala_artifact_with_suffix("org.scalatest:scalatest"),
46-
scala_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
47-
scala_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
48-
scala_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
49-
scala_artifact_with_suffix("org.scalactic:scalactic"),
50-
scala_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
51-
scala_artifact_with_suffix("org.mockito:mockito-scala"),
43+
maven_artifact_with_suffix("org.scalatest:scalatest-matchers-core"),
44+
maven_artifact_with_suffix("org.scalatest:scalatest-core"),
45+
maven_artifact_with_suffix("org.scalatest:scalatest"),
46+
maven_artifact_with_suffix("org.scalatest:scalatest-flatspec"),
47+
maven_artifact_with_suffix("org.scalatest:scalatest-funsuite"),
48+
maven_artifact_with_suffix("org.scalatest:scalatest-shouldmatchers"),
49+
maven_artifact_with_suffix("org.scalactic:scalactic"),
50+
maven_artifact_with_suffix("org.scalatestplus:mockito-3-4"),
51+
maven_artifact_with_suffix("org.mockito:mockito-scala"),
5252
maven_artifact("org.mockito:mockito-core"),
53-
scala_artifact("org.scalatest:scalatest-compatible"),
53+
maven_artifact("org.scalatest:scalatest-compatible"),
5454
maven_artifact("junit:junit"),
5555
maven_artifact("com.novocode:junit-interface"),
5656
maven_artifact("net.bytebuddy:byte-buddy"),

0 commit comments

Comments
 (0)