Skip to content

Commit

Permalink
[duckdb] Bumped duckdb_jdbc to 1.2.0 (#1514)
Browse files Browse the repository at this point in the history
Miscellaneous:

- Got rid of the build tech debt related to the previous dependency on a
  SNAPSHOT release.

- Moved the asm dependency from all sub-modules to DVC, which is the only
  module that actually uses it.
  • Loading branch information
FelixGV authored Feb 10, 2025
1 parent 1f12bd1 commit 9d7c4a8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 24 deletions.
8 changes: 1 addition & 7 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
version: 2
registries:
# Helps find updates for non Maven Central dependencies'
duckdb-snapshots:
type: maven-repository
url: https://oss.sonatype.org/content/repositories/snapshots/

updates:
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "daily"
registries:
- duckdb-snapshots
# Automatically update these dependencies
allow:
- dependency-name: "org.duckdb:duckdb_jdbc"
- dependency-name: "org.duckdb:duckdb_jdbc"
13 changes: 3 additions & 10 deletions all-modules/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@
// via transitive dependencies instead of enumerating all modules individually.
dependencies {
rootProject.subprojects.each { subproject ->
// Excluding venice-duckdb as it's experimental and causes build issues
if (subproject.path != project.path && subproject.subprojects.isEmpty() && subproject.path != ':integrations:venice-duckdb') {
implementation (project(subproject.path)) {
exclude group: 'org.duckdb'
exclude module: 'venice-duckdb'
}
if (subproject.path != project.path && subproject.subprojects.isEmpty()) {
implementation project(subproject.path)
}
}
implementation (project(path: ':internal:venice-test-common', configuration: 'integrationTestUtils')) {
exclude group: 'org.duckdb'
exclude module: 'venice-duckdb'
}
implementation project(path: ':internal:venice-test-common', configuration: 'integrationTestUtils')
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ ext.libraries = [
apacheSparkAvro: "org.apache.spark:spark-avro_${scala}:${apacheSparkVersion}",
apacheSparkCore: "org.apache.spark:spark-core_${scala}:${apacheSparkVersion}",
apacheSparkSql: "org.apache.spark:spark-sql_${scala}:${apacheSparkVersion}",
asm: "org.ow2.asm:asm:9.7",
avro: "org.apache.avro:avro:${avroVersion}",
avroCompiler: "org.apache.avro:avro-compiler:${avroVersion}",
avroMapred: "org.apache.avro:avro-mapred:${avroVersion}",
Expand All @@ -82,7 +83,7 @@ ext.libraries = [
commonsLang: 'commons-lang:commons-lang:2.6',
conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.5.2',
d2: "com.linkedin.pegasus:d2:${pegasusVersion}",
duckdbJdbc: "org.duckdb:duckdb_jdbc:1.2.0-20250130.011706-145", // TODO: Remove SNAPSHOT when the real release is published!
duckdbJdbc: "org.duckdb:duckdb_jdbc:1.2.0",
failsafe: 'net.jodah:failsafe:2.4.0',
fastUtil: 'it.unimi.dsi:fastutil:8.3.0',
grpcNettyShaded: "io.grpc:grpc-netty-shaded:${grpcVersion}",
Expand Down Expand Up @@ -291,7 +292,6 @@ subprojects {
implementation libraries.grpcProtobuf
implementation libraries.grpcServices
implementation libraries.grpcStub
implementation 'org.ow2.asm:asm:9.7'
compileOnly libraries.tomcatAnnotations
}

Expand Down
3 changes: 2 additions & 1 deletion clients/da-vinci-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ dependencies {
implementation project(':clients:venice-thin-client')

implementation libraries.avroUtilFastserde
implementation libraries.asm
implementation libraries.caffeine
implementation libraries.fastUtil
implementation libraries.httpAsyncClient
Expand All @@ -55,4 +56,4 @@ checkerFramework {
checkers = ['org.checkerframework.checker.nullness.NullnessChecker']
skipCheckerFramework = true
excludeTests = true
}
}
4 changes: 0 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ pluginManagement {
url "https://linkedin.jfrog.io/artifactory/open-source"
}
gradlePluginPortal()
maven {
// Needed for DuckDB SNAPSHOT. TODO: Remove when the real release is published!
url = uri('https://oss.sonatype.org/content/repositories/snapshots/')
}
}
}

Expand Down

0 comments on commit 9d7c4a8

Please sign in to comment.