Skip to content

Commit

Permalink
Merge branch 'develop' into 4279-statestore-updates-for-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rtjd6554 authored Feb 20, 2025
2 parents d5c9683 + d029136 commit b94d7ed
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 34 deletions.
40 changes: 22 additions & 18 deletions .github/workflows/dependency-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,25 @@ jobs:
- name: Resolve dependencies
run: mvn de.qaware.maven:go-offline-maven-plugin:resolve-dependencies -Dmaven.repo.local=${{ runner.temp }}/.m2/repository
working-directory: ./java
- name: Update CVEs database
run: mvn --batch-mode dependency-check:update-only -Dmaven.repo.local=${{ runner.temp }}/.m2/repository
working-directory: ./java
- name: Build with Maven
run: mvn --batch-mode verify dependency-check:aggregate -Pquick,skipShade -DskipRust -Dmaven.repo.local=${{ runner.temp }}/.m2/repository
working-directory: ./java
- name: Cache Maven dependencies & CVEs database
uses: actions/cache/save@v3
if: ${{ always() }}
with:
path: ${{ runner.temp }}/.m2/repository
key: ${{ steps.restore-cache.outputs.cache-primary-key }}
- name: Upload dependency check report
if: ${{ always() }}
uses: actions/upload-artifact@v4
with:
name: Dependency check report
path: java/target/dependency-check-report.html
- name: Explain disabled workflow
run: |
echo "Temporarily disabled checks as the NVD API is too slow."
echo "See the following issue: https://github.com/gchq/sleeper/issues/4293"
# - name: Update CVEs database
# run: mvn --batch-mode dependency-check:update-only -Dmaven.repo.local=${{ runner.temp }}/.m2/repository
# working-directory: ./java
# - name: Build with Maven
# run: mvn --batch-mode verify dependency-check:aggregate -Pquick,skipShade -DskipRust -Dmaven.repo.local=${{ runner.temp }}/.m2/repository
# working-directory: ./java
# - name: Cache Maven dependencies & CVEs database
# uses: actions/cache/save@v3
# if: ${{ always() }}
# with:
# path: ${{ runner.temp }}/.m2/repository
# key: ${{ steps.restore-cache.outputs.cache-primary-key }}
# - name: Upload dependency check report
# if: ${{ always() }}
# uses: actions/upload-artifact@v4
# with:
# name: Dependency check report
# path: java/target/dependency-check-report.html
6 changes: 3 additions & 3 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@
<!-- jungrapht-visualization-samples also declares an old version, which is a dependency of the build module. -->
<logback.version>1.5.16</logback.version>
<aws-java-sdk.version>1.12.498</aws-java-sdk.version>
<aws-java-sdk-v2.version>2.30.22</aws-java-sdk-v2.version>
<aws-crt.version>0.34.1</aws-crt.version>
<aws-java-sdk-v2.version>2.30.24</aws-java-sdk-v2.version>
<aws-crt.version>0.35.0</aws-crt.version>
<aws-lambda-java-events.version>3.15.0</aws-lambda-java-events.version>
<aws-lambda-java-core.version>1.2.3</aws-lambda-java-core.version>
<aws-lambda-powertools.version>1.18.0</aws-lambda-powertools.version>
Expand Down Expand Up @@ -181,7 +181,7 @@
<junit.version>5.11.4</junit.version>
<junit.platform.version>1.11.4</junit.platform.version>
<mockito.version>5.15.2</mockito.version>
<testcontainers.version>1.20.4</testcontainers.version>
<testcontainers.version>1.20.5</testcontainers.version>
<wiremock.version>2.35.2</wiremock.version>
<assertj.version>3.27.3</assertj.version>
<approvaltests.version>24.17.0</approvaltests.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.140" } # Exception handling for Rust
cxx = { version = "1.0.141" } # Exception handling for Rust
libc = { version = "0.2.169" } # FFI type support
log = { version = "0.4.25" } # Logging support
arrow = { version = "54.2.0", features = ["prettyprint"] } # 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.140" }
cxx = { version = "1.0.141" }

[build-dependencies]
cxx-build = { version = "1.0.140" }
cxx-build = { version = "1.0.141" }
git2 = { version = "0.20.0" }

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

0 comments on commit b94d7ed

Please sign in to comment.