Skip to content

Fix Vuls, update springboot and tomcat #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BraisVQ merged 5 commits into from
Apr 7, 2026
Merged

Fix Vuls, update springboot and tomcat #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2ce7c8a
Update Spring Boot and dependency management plugin versions
BraisVQ Apr 1, 2026
4021533
Refactor projectKeyExists and buildProjectKey method calls to use isN…
BraisVQ Apr 1, 2026
adb1da2
Enable circular bean references for WebSecurityConfigurerAdapter in a…
BraisVQ Apr 2, 2026
f737185
Override managed Tomcat version to address CVE-2025-31650
BraisVQ Apr 2, 2026
e2e6bf6
changelog
BraisVQ Apr 2, 2026
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
## Unreleased

### Fixed
- Fix Vuls (CVE-2023-44487 & CVE-2025-31650), update springboot and tomcat ([#763](https://github.com/opendevstack/ods-provisioning-app/pull/763))


## [4.4.0] - 2026-02-25
### Fixed
Expand Down
8 changes: 6 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ buildscript {
}

plugins {
id 'org.springframework.boot' version '2.5.12'
id 'io.spring.dependency-management' version '1.0.10.RELEASE'
id 'org.springframework.boot' version '2.7.18'
id 'io.spring.dependency-management' version '1.1.4'
id 'java'
id 'maven-publish'
id 'jacoco'
Expand All @@ -33,6 +33,10 @@ group = 'prov'
version = '0.0.1-SNAPSHOT'
sourceCompatibility = 1.11

// Override managed Tomcat version to address CVE-2025-31650 (fixed in 9.0.104)
// Spring Boot 2.7.x uses Tomcat 9.x; 10.x/11.x require Spring Boot 3.x
ext['tomcat.version'] = '9.0.104'

repositories {
if (!no_nexus) {
println("INFO: using nexus repositories, because property no_nexus=$no_nexus and nexus_url=${nexus_url}")
Expand Down
4 changes: 4 additions & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ logging.level.org.opendevstack=DEBUG
# NOTE: this path is for local environemrnt. Do not forget to set in production to a different path
logging.file.path=./build/logs

# Spring Boot 2.6+ disallows circular bean references by default.
# Required for WebSecurityConfigurerAdapter-based security configuration.
spring.main.allow-circular-references=true

#server port
server.port=8080
server.error.include-stacktrace=never
Expand Down
10 changes: 5 additions & 5 deletions src/test/java/org/opendevstack/provision/controller/ProjectApiControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ public void addProjectInLegacyFormatErrorsOut() throws Exception {

@Test
public void validateProjectWithProjectExists() throws Exception {
when(jiraAdapter.projectKeyExists(isNotNull(String.class))).thenReturn(true);
when(jiraAdapter.projectKeyExists(isNotNull())).thenReturn(true);

mockMvc
.perform(
Expand All @@ -543,7 +543,7 @@ public void validateProjectWithProjectExists() throws Exception {

@Test
public void validateProjectWithProjectNotExists() throws Exception {
when(jiraAdapter.projectKeyExists(isNotNull(String.class))).thenReturn(false);
when(jiraAdapter.projectKeyExists(isNotNull())).thenReturn(false);

mockMvc
.perform(
Expand All @@ -556,7 +556,7 @@ public void validateProjectWithProjectNotExists() throws Exception {

@Test
public void validateKeyWithKeyExists() throws Exception {
when(jiraAdapter.projectKeyExists(isNotNull(String.class))).thenReturn(true);
when(jiraAdapter.projectKeyExists(isNotNull())).thenReturn(true);
mockMvc
.perform(
get("/api/v2/project/key/validate")
Expand All @@ -568,7 +568,7 @@ public void validateKeyWithKeyExists() throws Exception {

@Test
public void validateKeyWithKeyNotExists() throws Exception {
when(jiraAdapter.projectKeyExists(isNotNull(String.class))).thenReturn(false);
when(jiraAdapter.projectKeyExists(isNotNull())).thenReturn(false);

mockMvc
.perform(
Expand All @@ -581,7 +581,7 @@ public void validateKeyWithKeyNotExists() throws Exception {

@Test
public void generateKey() throws Exception {
when(jiraAdapter.buildProjectKey(isNotNull(String.class))).thenReturn("PROJ");
when(jiraAdapter.buildProjectKey(isNotNull())).thenReturn("PROJ");

mockMvc
.perform(
Expand Down
Loading