Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions extensions/flight-sql/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ dependencies {
// grpc://localhost:10000
adbcTestImplementation project(':server-jetty')
adbcTestImplementation libs.adbc.flight.sql
// The BouncyCastle provider must be pinned to a particular version, because otherwise we end up with a dynamic
// range "org.bouncycastle:bcprov-jdk18on:[1.80,1.81)" from org.apache.arrow:flight-sql-jdbc-core:18.3.0 which is
// not permitted by our build.
adbcTestImplementation libs.bcprov.jdk18on
adbcTestImplementation libs.bcutil.jdk18on
adbcTestImplementation libs.bcpkix.jdk18on
Comment on lines +62 to +67
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I would be wary of doing this; it seems like later releases of BouncyCastle have started using specific versions instead of ranges. If anything, I would want to see us use a dependency constraints block, possibly just against a newer version of BouncyCastle.


adbcTestImplementation project(':server-test-utils')
adbcTestAnnotationProcessor libs.dagger.compiler
Expand Down
8 changes: 7 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
[versions]
adbc = "0.21.0"
adbc = "0.23.0"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I would add a note "on bump, check if dependency constraint workaround can be removed".

airlift = "2.0.3"
arrow = "18.3.0"
autoservice = "1.1.1"
avro = "1.12.1"
awssdk = "2.29.52"
aws-s3-tables-catalog-for-iceberg = "0.1.8"

bouncycastle = "1.81"

# Note: when bumping Calcite version, see if we still need the version constraint for json-smart
calcite = "1.41.0"
json-smart = "2.5.2"
Expand Down Expand Up @@ -133,6 +135,10 @@ awssdk-sso = { module = "software.amazon.awssdk:sso" }
awssdk-ssooidc = { module = "software.amazon.awssdk:ssooidc" }
awssdk-netty-nio = { module = "software.amazon.awssdk:netty-nio-client" }

bcprov-jdk18on = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bouncycastle" }
bcutil-jdk18on = { module = "org.bouncycastle:bcutil-jdk18on", version.ref = "bouncycastle" }
bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bouncycastle" }

s3-tables-catalog-for-iceberg = { module = "software.amazon.s3tables:s3-tables-catalog-for-iceberg", version.ref = "aws-s3-tables-catalog-for-iceberg" }

calcite-core = { module = "org.apache.calcite:calcite-core", version.ref = "calcite" }
Expand Down
Loading