Skip to content

Commit

Permalink
Merge branch 'develop' into 3907-validate-sqsqueues-includes-all-queu…
Browse files Browse the repository at this point in the history
…e-properties
  • Loading branch information
rtjd6554 authored Dec 17, 2024
2 parents 6b97008 + 748b4bc commit 4e60665
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<jjwt.build.version>0.12.6</jjwt.build.version>
<facebook.collections.version>0.1.32</facebook.collections.version>
<!-- Facebook Collections brings in a vulnerable version of Guava, so we manage this -->
<guava.version>33.3.1-jre</guava.version>
<guava.version>33.4.0-jre</guava.version>
<cdk.version>2.173.1</cdk.version>
<cdk.kubectl.24.version>2.0.242</cdk.kubectl.24.version>
<constructs.version>10.4.2</constructs.version>
Expand Down Expand Up @@ -177,7 +177,7 @@
<scijava.native.version>2.5.0</scijava.native.version>
<!-- Testing -->
<junit.version>5.11.4</junit.version>
<junit.platform.version>1.11.3</junit.platform.version>
<junit.platform.version>1.11.4</junit.platform.version>
<mockito.version>5.14.2</mockito.version>
<testcontainers.version>1.20.4</testcontainers.version>
<wiremock.version>2.35.2</wiremock.version>
Expand Down
20 changes: 10 additions & 10 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rust/compaction/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ crate-type = ["cdylib", "rlib"]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
cxx = { version = "1.0.134" } # Exception handling for Rust
cxx = { version = "1.0.135" } # Exception handling for Rust
libc = { version = "0.2.168" } # FFI type support
log = { version = "0.4.22" } # Logging support
arrow = { version = "53.3.0" } # Batch of reading from Parquet files
Expand Down
4 changes: 2 additions & 2 deletions rust/rust_sketch/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ keywords = ["datasketches", "sketch", "quantile_sketch"]
license = "Apache-2.0"

[dependencies]
cxx = { version = "1.0.134" }
cxx = { version = "1.0.135" }

[build-dependencies]
cxx-build = { version = "1.0.134" }
cxx-build = { version = "1.0.135" }
git2 = { version = "0.19.0" }

[target.'cfg(target_os = "macos")'.build-dependencies]
Expand Down

0 comments on commit 4e60665

Please sign in to comment.