Skip to content

Commit 858cc4e

Browse files
authored
Ab2 d 6625/upgrade spring 3.4.4 (#116)
* Upgraded Spring boot to 3.4.4 * upgraded gradle to 8.4
1 parent 71e58e1 commit 858cc4e

File tree

8 files changed

+20
-17
lines changed

8 files changed

+20
-17
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
3333
with:
34-
gradle-version: 7.5
34+
gradle-version: 8.4
3535

3636
- uses: cmsgov/ab2d-bcda-dpc-platform/actions/aws-params-env-action@main
3737
with:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
- uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
2727
with:
28-
gradle-version: 7.5
28+
gradle-version: 8.4
2929

3030
- uses: cmsgov/ab2d-bcda-dpc-platform/actions/aws-params-env-action@main
3131
env:

Jenkinsfile.deployment

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ pipeline {
88
}
99

1010
tools {
11-
gradle "gradle-7.5"
11+
gradle "gradle-8.4"
1212
jdk 'openjdk17'
1313
}
1414

Jenkinsfile.testing

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pipeline {
1212
}
1313

1414
tools {
15-
gradle "gradle-7.5"
15+
gradle "gradle-8.4"
1616
jdk 'openjdk17'
1717
}
1818

build.gradle

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id 'java'
3-
id 'org.springframework.boot' version '3.2.8'
3+
id 'org.springframework.boot' version '3.4.4'
44
id 'com.jfrog.artifactory' version '4.33.1' apply false
55
id "org.sonarqube" version "4.1.0.3113"
66
id "gov.cms.ab2d.plugin" version "1.0.2"
@@ -12,33 +12,34 @@ version="2.0.0"
1212
group = "gov.cms.ab2d"
1313

1414
ext {
15-
lombokVersion = '1.18.34'
16-
springCloudAwsVersion = '3.1.1'
17-
springBootVersion='3.2.8'
18-
testContainerVersion='1.20.1'
15+
lombokVersion = '1.18.38'
16+
springCloudAwsVersion = '3.3.0'
17+
springBootVersion='3.4.4'
18+
testContainerVersion='1.20.6'
19+
liquibaseVersion = '4.31.1'
1920
}
2021

2122
allprojects {
2223
apply plugin: "org.cyclonedx.bom"
2324
dependencies {
24-
implementation 'gov.cms.ab2d:ab2d-events-client:3.2.5'
25-
implementation 'gov.cms.ab2d:ab2d-contracts-client:2.0.0'
26-
implementation 'gov.cms.ab2d:ab2d-properties-client:2.0.0'
25+
implementation 'gov.cms.ab2d:ab2d-events-client:3.3.5'
26+
implementation 'gov.cms.ab2d:ab2d-contracts-client:2.1.0'
27+
implementation 'gov.cms.ab2d:ab2d-properties-client:2.1.0'
2728
implementation "io.awspring.cloud:spring-cloud-aws:${springCloudAwsVersion}"
2829
implementation "io.awspring.cloud:spring-cloud-aws-dependencies:${springCloudAwsVersion}"
2930
implementation "io.awspring.cloud:spring-cloud-aws-starter:${springCloudAwsVersion}"
3031
implementation "io.awspring.cloud:spring-cloud-aws-starter-sqs:${springCloudAwsVersion}"
3132
implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
32-
implementation 'org.liquibase:liquibase-core:4.23.0'
33+
implementation "org.liquibase:liquibase-core:${liquibaseVersion}"
3334
implementation 'org.postgresql:postgresql:42.7.3'
3435
implementation "org.springframework.boot:spring-boot-starter-quartz:${springBootVersion}"
3536
implementation "org.springframework.boot:spring-boot-starter-webflux:${springBootVersion}"
3637
implementation "org.springframework.boot:spring-boot-starter-data-jpa:${springBootVersion}"
3738
implementation "org.springframework.boot:spring-boot-starter-validation:${springBootVersion}"
3839
implementation "org.springframework.boot:spring-boot-starter-web:${springBootVersion}"
39-
implementation 'org.springframework:spring-context:6.2.1'
40+
implementation 'org.springframework:spring-context:6.2.5'
4041
implementation 'org.springdoc:springdoc-openapi-ui:1.8.0'
41-
testImplementation 'org.mockito:mockito-inline:5.2.0'
42+
testImplementation 'org.mockito:mockito-core:5.16.1'
4243
testImplementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
4344
testImplementation "org.testcontainers:localstack:${testContainerVersion}"
4445
testImplementation "org.testcontainers:postgresql:${testContainerVersion}"

src/main/resources/db/changelog/db.changelog-master.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@ databaseChangeLog:
44
- include:
55
file: db/changelog/v2023/contract-service-coverage-info.sql
66
- include:
7-
file: db/changelog/v2025/add_sequence.sql
7+
file: db/changelog/v2025/add_contract_sequence.sql
8+
- include:
9+
file: db/changelog/v2025/alter_contract_sequence.sql
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
CREATE SEQUENCE IF NOT EXISTS contract.contract_seq START 1 INCREMENT BY 50;
22
SELECT setval('contract.contract_seq', COALESCE((SELECT MAX(id) FROM contract.contract), 1), true);
3-
ALTER TABLE contract.contract ALTER COLUMN id SET DEFAULT nextval('contract.contract_seq');
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE contract.contract ALTER COLUMN id SET DEFAULT nextval('contract.contract_seq');

0 commit comments

Comments
 (0)