Skip to content

Commit

Permalink
Merge branch 'develop' into conditions-update-logging-expanded-classi…
Browse files Browse the repository at this point in the history
…fier
  • Loading branch information
tyler-spangler6 authored Dec 2, 2024
2 parents 2e77960 + 48e2a63 commit 6fda605
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 22 deletions.
13 changes: 3 additions & 10 deletions .github/actions/setup-vro/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@ runs:
# cache the Gradle User Home"
# cache: 'gradle'

- name: "Setup Gradle"
uses: gradle/actions/setup-gradle@v3
with:
# Only write to the cache for builds on the 'main' and 'develop' branches. (Default is 'main' only.)
# Builds on other branches will only read existing entries from the cache.
cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/qa' && github.ref != 'refs/heads/develop' }}
# To avoid a growing cache over time, attempt to delete any files in the Gradle User Home
# that were not used by Gradle during the workflow, prior to saving the cache.
# https://github.com/gradle/actions/setup-gradle@v3#removing-unused-files-from-gradle-user-home-before-saving-to-cache
gradle-home-cache-cleanup: true
- name: "Clear Gradle Cache"
shell: bash
run: rm -rf ~/.gradle || true

- uses: ./.github/actions/install-java-tools

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-gradle-files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
# cache the Gradle User Home"
# cache: 'gradle'
- name: "Setup Gradle"
uses: gradle/actions/setup-gradle@v4
uses: gradle/actions/setup-gradle@v3
with:
# Only write to the cache for builds on the 'main' and 'develop' branches. (Default is 'main' only.)
# Builds on other branches will only read existing entries from the cache.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/secrel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
outputs:
vro-images: ${{ steps.publish-images.outputs.images_list }}
slack-response-ts: ${{ fromJson(steps.notify-slack.outputs.slack-result).response.message.ts }}
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
steps:
- name: "Determine image tag"
id: image-props
Expand Down
2 changes: 1 addition & 1 deletion db-init/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM flyway/flyway:10.21-alpine
FROM flyway/flyway:11.0-alpine

# hadolint ignore=DL3018
RUN <<EOR
Expand Down
4 changes: 2 additions & 2 deletions db-init/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.flywaydb.flyway' version '10.21.0'
id 'org.flywaydb.flyway' version '11.0.0'
id 'shared.docker.container-conventions'
id 'shared.java.vro-dep-constraints'
}
Expand All @@ -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.1'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
}
}

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.22.0 as awscli
FROM amazon/aws-cli:2.22.8 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 gradle-plugins/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
// Set versions for these plugins so we don't have to repeat the versions in convention.gradle files
// https://discuss.gradle.org/t/applying-a-plugin-version-inside-a-convention-plugin/42160
// Syntax: "<pluginName>:<pluginName>.gradle.plugin:<pluginVersion>"
implementation 'io.freefair.lombok:io.freefair.lombok.gradle.plugin:8.11'
implementation 'io.freefair.lombok:io.freefair.lombok.gradle.plugin:8.10.2' // NOTE: As VRO is being shut down, this version is pinned to get around a .gradle issue with removeUnusedEntriesOlderThan.
implementation 'com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:6.24.0'
implementation 'com.felipefzdz.gradle.shellcheck:com.felipefzdz.gradle.shellcheck.gradle.plugin:1.4.6'
implementation 'com.palantir.docker:com.palantir.docker.gradle.plugin:0.35.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {
implementation 'org.apache.commons:commons-compress:1.24.0'

// for tomcat
implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.25'
implementation 'org.apache.tomcat.embed:tomcat-embed-core:10.1.31'

implementation 'org.springframework.amqp:spring-amqp:3.0.10'
implementation 'org.springframework.security:spring-security-config:6.1.5'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
4 changes: 2 additions & 2 deletions svc-bie-kafka/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ dependencies {

// avro schema and kafka
implementation 'org.apache.avro:avro:1.12.0'
implementation 'io.confluent:kafka-avro-serializer:7.7.1'
implementation 'org.apache.kafka:connect-api:7.7.1-ce'
implementation 'org.apache.kafka:connect-api:7.7.2-ce'
implementation 'io.confluent:kafka-avro-serializer:7.7.2'
implementation 'org.apache.commons:commons-compress:1.27.1'
implementation 'com.google.guava:guava:33.3.1-jre'
// RabbitMQ
Expand Down
2 changes: 1 addition & 1 deletion svc-bip-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {

implementation "com.fasterxml.jackson.core:jackson-core"
implementation "com.fasterxml.jackson.core:jackson-databind"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1"
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2"

def jjwt_version = "0.12.6"
implementation "io.jsonwebtoken:jjwt-api:${jjwt_version}"
Expand Down

0 comments on commit 6fda605

Please sign in to comment.