Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion buffer-clienttests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {
apacheMath = '3.6.1'
findbugsAnnotations = "3.0.1u2"
guava = "33.4.8-jre"
jackson = "2.19.1"
jackson = "2.19.2"
jersey = "3.1.10"
kubernetesClient = "24.0.0-legacy"
logback = "1.5.18"
Expand Down
34 changes: 17 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Build Script Classpath
buildscript {
ext {
springBootVersion = '3.5.3'
springBootVersion = '3.5.4'
}
dependencies {
// jib build requires this dependency;
// see https://github.com/GoogleContainerTools/jib/issues/4235
classpath group: 'org.apache.commons', name: 'commons-compress', version: '1.27.1'
classpath group: 'com.fasterxml.jackson', name: 'jackson-bom', version: '2.19.1'
classpath group: 'org.apache.commons', name: 'commons-compress', version: '1.28.0'
classpath group: 'com.fasterxml.jackson', name: 'jackson-bom', version: '2.19.2'
}
}

Expand All @@ -16,7 +16,7 @@ plugins {
id 'jacoco'
id 'java'

id 'com.diffplug.spotless' version '7.0.4'
id 'com.diffplug.spotless' version '7.2.1'
id 'com.github.ben-manes.versions' version '0.52.0'
id 'com.google.cloud.tools.jib' version '3.4.5'
id 'de.undercouch.download' version '5.6.0'
Expand Down Expand Up @@ -65,21 +65,21 @@ repositories {

dependencies {
// Terra deps - we get Stairway via TCL
implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.42-SNAPSHOT'
implementation (group: 'bio.terra', name: 'terra-cloud-resource-lib', version: '1.2.34-SNAPSHOT') {
implementation group: 'bio.terra', name: 'terra-common-lib', version: '1.1.43-SNAPSHOT'
implementation (group: 'bio.terra', name: 'terra-cloud-resource-lib', version: '1.2.39-SNAPSHOT') {
exclude(group: 'com.microsoft.azure')
exclude(group: 'com.azure')
}
implementation group: 'bio.terra', name: 'terra-resource-janitor-client', version: '0.113.50-SNAPSHOT'

// Versioned direct deps
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '6.9.0'
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '6.9.0'
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-spring', version: '6.9.2'
implementation group: 'net.javacrumbs.shedlock', name: 'shedlock-provider-jdbc-template', version: '6.9.2'
implementation group: 'com.google.auto.value', name: 'auto-value-annotations', version: '1.11.0'
implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.140.2'
implementation group: 'com.google.cloud', name: 'google-cloud-pubsub', version: '1.141.2'
implementation group: 'com.google.guava', name: 'guava', version: '33.4.8-jre'
implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.1'
implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.32.0'
implementation group: 'org.liquibase', name: 'liquibase-core', version: '4.33.0'
implementation group: 'org.webjars', name: 'webjars-locator-core', version: '0.59'
runtimeOnly group: 'org.postgresql', name: 'postgresql'

Expand All @@ -90,17 +90,17 @@ dependencies {

// Deps whose versions are controlled by Spring
implementation group: 'org.apache.commons', name: 'commons-dbcp2', version: '2.13.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.18.0'
implementation group: 'org.apache.commons', name: 'commons-pool2', version: '2.12.1'
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jdbc', version: "${springBootVersion}"
implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: "${springBootVersion}"
implementation group: 'org.springframework.retry', name: 'spring-retry', version: '2.0.12'

// Swagger deps
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.19.1'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.19.2'
implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.16'
implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.34'
runtimeOnly group: 'org.webjars.npm', name: 'swagger-ui-dist', version: '5.26.0'
implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.35'
runtimeOnly group: 'org.webjars.npm', name: 'swagger-ui-dist', version: '5.27.1'
swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.61'

// Test deps
Expand All @@ -117,9 +117,9 @@ dependencies {
// transitive dependencies.
constraints {
implementation('org.yaml:snakeyaml:2.4')
implementation('com.nimbusds:nimbus-jose-jwt:10.3.1')
implementation('io.projectreactor.netty:reactor-netty-http:1.2.7')
implementation('com.fasterxml.jackson:jackson-bom:2.19.1')
implementation('com.nimbusds:nimbus-jose-jwt:10.4.1')
implementation('io.projectreactor.netty:reactor-netty-http:1.2.8')
implementation('com.fasterxml.jackson:jackson-bom:2.19.2')
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import org.springframework.context.annotation.Configuration;

@Configuration
@ConfigurationProperties(prefix = "buffer.db.cleanup-job")
@ConfigurationProperties(prefix = "buffer.db-cleanup-job")
public class DbCleanupJobConfiguration {

private String schedule;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/bio/terra/buffer/db/DbCleanupJob.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void initialize() {
logger.info("DB table cleanup job schedule = {}", config.getSchedule());
}

@Scheduled(cron = "${buffer.db.cleanup-job.schedule}")
@Scheduled(cron = "${buffer.db-cleanup-job.schedule}")
@SchedulerLock(name = "Table Cleanup Job", lockAtMostFor = "PT1H")
public void tableCleanupJob() {
if (!config.isEnabled()) {
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ buffer:
update-db-on-start: true
uri: jdbc:postgresql://127.0.0.1:5432/${BUFFER_DATABASE_NAME}
username:
cleanup-job:
enabled: false
schedule: 0 0 10 * * * # every day at 10 am
retention-days: 30
batch-size: 1000
db-cleanup-job:
enabled: false
schedule: 0 0 10 * * * # every day at 10 am
retention-days: 30
batch-size: 1000
primary:
scheduler-enabled: true
pool:
Expand All @@ -20,7 +20,7 @@ buffer:
# Whether to update pool when config changes during server startup.
# Might be useful to avoid potential backward compatibility caused by config change and make tests easier.
update-pool-on-start: true
# Alternative system file path to read the config files from. If not set, fall back to reading from config-path.
# Alternative system file path to read the config files from. If not set, fall back to reading from config-path.
system-file-path:
stairway:
db:
Expand Down
4 changes: 2 additions & 2 deletions terra-resource-buffer-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ repositories {

dependencies {
swaggerCodegen group: 'io.swagger.codegen.v3', name: 'swagger-codegen-cli', version: '3.0.61'
implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.34'
implementation group: 'io.swagger.core.v3', name: 'swagger-annotations', version: '2.2.35'
implementation group: 'io.swagger', name: 'swagger-annotations', version: '1.6.16'
implementation group: 'org.glassfish.jersey.core', name: 'jersey-client', version: '3.1.10'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-json-jackson', version: '3.1.10'
implementation group: 'org.glassfish.jersey.media', name: 'jersey-media-multipart', version: '3.1.10'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.19.1'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.19.2'
implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '3.0.0'
implementation group: 'jakarta.ws.rs', name: 'jakarta.ws.rs-api', version: '4.0.0'
}
Expand Down
Loading