Skip to content

Commit 00684f1

Browse files
authored
Upgrade to spring boot 3.3 and fix CVEs breaking the CVE scan (#216)
1 parent 4635519 commit 00684f1

File tree

9 files changed

+27
-13
lines changed

9 files changed

+27
-13
lines changed

.github/node-cve-ignore-list.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">
2+
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
5+
6+
<suppress>
7+
<cpe>cpe:/a:bootstrap:bootstrap:5.3.3</cpe>
8+
<cve>CVE-2024-6484</cve>
9+
<cve>CVE-2024-6531</cve>
10+
</suppress>
11+
312
</suppressions>

account-service/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
plugins {
99
id 'java'
10-
id 'org.springframework.boot' version '3.3.1'
11-
id 'io.spring.dependency-management' version '1.1.5'
10+
id 'org.springframework.boot' version '3.3.3'
11+
id 'io.spring.dependency-management' version '1.1.6'
1212
}
1313

1414
group = 'finos.traderx.account-service'
@@ -23,7 +23,7 @@ dependencies {
2323
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
2424
implementation 'org.springframework.boot:spring-boot-starter-web'
2525
implementation 'com.h2database:h2:2.2.224'
26-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
26+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
2727

2828
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2929
}

account-service/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ spring.datasource.password=${DATABASE_DBPASS:sa}
77
spring.data.jpa.database-platform=org.hibernate.dialect.H2Dialect
88
spring.data.jpa.show-sql=true
99
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
10+
spring.threads.virtual.enabled=true
1011

1112
# To avoid "Request header is too large" when application is backed by oidc proxy.
1213
server.max-http-request-header-size=1000000

position-service/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
plugins {
99
id 'java'
10-
id 'org.springframework.boot' version '3.3.1'
11-
id 'io.spring.dependency-management' version '1.1.5'
10+
id 'org.springframework.boot' version '3.3.3'
11+
id 'io.spring.dependency-management' version '1.1.6'
1212
}
1313

1414
group = 'finos.traderx.position-service'
@@ -23,7 +23,7 @@ dependencies {
2323
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
2424
implementation 'org.springframework.boot:spring-boot-starter-web'
2525
implementation 'com.h2database:h2:2.2.224'
26-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
26+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
2727

2828
testImplementation 'org.springframework.boot:spring-boot-starter-test'
2929
}

position-service/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ spring.datasource.password=${DATABASE_DBPASS:sa}
77
spring.data.jpa.database-platform=org.hibernate.dialect.H2Dialect
88
spring.data.jpa.show-sql=true
99
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
10+
spring.threads.virtual.enabled=true
1011

1112
# To avoid "Request header is too large" when application is backed by oidc proxy.
1213
server.max-http-request-header-size=1000000

trade-processor/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
plugins {
99
id 'java'
10-
id 'org.springframework.boot' version '3.3.1'
11-
id 'io.spring.dependency-management' version '1.1.5'
10+
id 'org.springframework.boot' version '3.3.3'
11+
id 'io.spring.dependency-management' version '1.1.6'
1212
}
1313

1414
group = 'finos.traderx.trade-processor'
@@ -23,7 +23,7 @@ dependencies {
2323
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
2424
implementation 'org.springframework.boot:spring-boot-starter-web'
2525
implementation 'com.h2database:h2:2.2.224'
26-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
26+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
2727

2828
implementation('org.json:json:20240303') {
2929
because 'previous versions are affected by multiple CVE'

trade-processor/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ spring.data.jpa.show-sql=true
99
spring.jpa.hibernate.ddl-auto=update
1010

1111
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
12+
spring.threads.virtual.enabled=true
1213

1314
trade.feed.address=${TRADE_FEED_ADDRESS:http://${TRADE_FEED_HOST:localhost}:18086}
1415

trade-service/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
plugins {
99
id 'java'
10-
id 'org.springframework.boot' version '3.3.1'
11-
id 'io.spring.dependency-management' version '1.1.5'
10+
id 'org.springframework.boot' version '3.3.3'
11+
id 'io.spring.dependency-management' version '1.1.6'
1212
}
1313

1414
group = 'finos.traderx.trade-service'
@@ -27,7 +27,7 @@ dependencies {
2727
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
2828
implementation 'org.springframework.boot:spring-boot-starter-web'
2929
implementation 'com.h2database:h2:2.2.224'
30-
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0'
30+
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
3131

3232
implementation('org.json:json:20240303') {
3333
because 'previous versions are affected by multiple CVE'

trade-service/src/main/resources/application.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
server.port=${TRADING_SERVICE_PORT:18092}
2+
spring.threads.virtual.enabled=true
3+
24
people.service.url=${PEOPLE_SERVICE_URL:http://${PEOPLE_SERVICE_HOST:localhost}:18089}
35
account.service.url=${ACCOUNT_SERVICE_URL:http://${ACCOUNT_SERVICE_HOST:localhost}:18088}
46
reference.data.service.url=${REFERENCE_DATA_SERVICE_URL:http://${REFERENCE_DATA_HOST:localhost}:18085}

0 commit comments

Comments
 (0)