Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/gradle/develop/org.apache.http…
Browse files Browse the repository at this point in the history
…components.client5-httpclient5-5.4.1
  • Loading branch information
brostk authored Oct 29, 2024
2 parents 9bbca1e + 7980a30 commit 32fb971
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion db-init/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
// flywayMigration platform("gov.va.starter:starter-bom:${starter_boot_version}")
flywayMigration "org.postgresql:postgresql:${postgresql_version}"
constraints {
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.0'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.1'
}
}

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use the official AWS CLI image for the first stage
FROM amazon/aws-cli:2.18.15 as awscli
FROM amazon/aws-cli:2.18.16 as awscli

# Use the bitnami/minideb:bookworm as the base image for the second stage
FROM bitnami/minideb:bookworm
Expand Down
2 changes: 1 addition & 1 deletion svc-bgs-api/src/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'bunny', '>= 2.13.0'
gem 'activesupport', '~> 6.0'
gem 'bgs_ext', git: 'https://github.com/department-of-veterans-affairs/bgs-ext.git', require: 'bgs'
gem 'datadog_api_client', '>=2.23.0'
gem 'rexml', '~> 3.3', '>= 3.3.6'
gem 'rexml', '~> 3.3'
gem 'async', '>= 2.17.0'

group :development, :test do
Expand Down
6 changes: 2 additions & 4 deletions svc-bgs-api/src/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ GEM
racc (1.8.0)
rack (2.2.9)
rbtree (0.4.6)
rexml (3.3.6)
strscan
rexml (3.3.9)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
Expand All @@ -125,7 +124,6 @@ GEM
sorted_set (1.0.3)
rbtree
set (~> 1.0)
strscan (3.1.0)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand All @@ -147,7 +145,7 @@ DEPENDENCIES
bunny (>= 2.13.0)
cgi (~> 0.3.6)
datadog_api_client (>= 2.23.0)
rexml (~> 3.3, >= 3.3.6)
rexml (~> 3.3)
rspec

RUBY VERSION
Expand Down

0 comments on commit 32fb971

Please sign in to comment.