Skip to content

Chore: Upgrade dependencies #213

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

Open
mfd2007 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Chore: Upgrade dependencies #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ff7e05
chore: update dependencies
mfd2007 Nov 20, 2025
42e0c1e
chore: change deprecated feature, remove unused imports
mfd2007 Nov 20, 2025
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
40 changes: 23 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,32 @@
<url>https://github.com/secvisogram/csaf-cms-backend</url>

<properties>
<java.version>18</java.version>
<java.version>25</java.version>
<exclude.tests>nothing-to-exclude</exclude.tests>
<version.maven>3.3.9</version.maven>
<plugin.version.spdx>0.7.0</plugin.version.spdx>
<plugin.version.cyclonedx>2.7.10</plugin.version.cyclonedx>
<version.maven>3.6.3</version.maven>
<plugin.version.spdx>1.0.3</plugin.version.spdx>
<plugin.version.cyclonedx>2.9.1</plugin.version.cyclonedx>
<plugin.version.enforcer>3.3.9</plugin.version.enforcer>
<!--<plugin.version.spring-boot></plugin.version.spring-boot>-->
<plugin.version.spotbugs>4.8.2.0</plugin.version.spotbugs>
<plugin.version.checkstyle>3.3.1</plugin.version.checkstyle>
<plugin.version.jacoco>0.8.11</plugin.version.jacoco>
<dependency.version.springboot>3.2.4</dependency.version.springboot>
<dependency.version.cloudant>0.5.4</dependency.version.cloudant>
<dependency.version.swagger-annotations>2.2.21</dependency.version.swagger-annotations>
<dependency.version.swagger-models>2.2.21</dependency.version.swagger-models>
<dependency.version.commons-text>1.11.0</dependency.version.commons-text>
<plugin.version.spotbugs>4.9.8.1</plugin.version.spotbugs>
<plugin.version.checkstyle>3.6.0</plugin.version.checkstyle>
<plugin.version.jacoco>0.8.14</plugin.version.jacoco>
<dependency.version.cloudant>0.10.12</dependency.version.cloudant>
<dependency.version.swagger-annotations>2.2.40</dependency.version.swagger-annotations>
<dependency.version.swagger-models>2.2.40</dependency.version.swagger-models>
<dependency.version.commons-text>1.14.0</dependency.version.commons-text>
<dependency.version.springdoc-openapi>2.5.0</dependency.version.springdoc-openapi>
<dependency.version.semver4j>3.1.0</dependency.version.semver4j>
<dependency.version.zjsonpatch>0.4.16</dependency.version.zjsonpatch>
<dependency.version.org.graalvm.js>23.0.3</dependency.version.org.graalvm.js>
<dependency.version.org.graalvm.js-scriptengine>24.0.0</dependency.version.org.graalvm.js-scriptengine>
<dependency.version.spotbugs-annotations>4.8.4</dependency.version.spotbugs-annotations>
<dependency.version.org.graalvm.js>25.0.1</dependency.version.org.graalvm.js>
<dependency.version.org.graalvm.js-scriptengine>25.0.1</dependency.version.org.graalvm.js-scriptengine>
<dependency.version.spotbugs-annotations>4.9.8</dependency.version.spotbugs-annotations>
</properties>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.4</version>
<version>3.5.7</version>
</parent>

<profiles>
Expand Down Expand Up @@ -74,7 +73,7 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>${plugin.version.cyclonedx}</version>
<!--<version>${plugin.version.cyclonedx}</version>-->
<executions>
<execution>
<phase>package</phase>
Expand Down Expand Up @@ -206,11 +205,13 @@
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
<type>pom</type>
<version>${dependency.version.org.graalvm.js}</version>
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js-scriptengine</artifactId>
<type>pom</type>
<version>${dependency.version.org.graalvm.js-scriptengine}</version>
</dependency>

Expand Down Expand Up @@ -262,6 +263,11 @@
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

<build>
Expand Down
7 changes: 1 addition & 6 deletions src/main/java/de/bsi/secvisogram/csaf_cms_backend/json/IntegerVersioning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,11 @@

import de.bsi.secvisogram.csaf_cms_backend.service.PatchType;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;


@SuppressFBWarnings(value = "MS_EXPOSE_REP", justification = "Class has no internal state")
public class IntegerVersioning implements Versioning {

private static final Logger LOG = LoggerFactory.getLogger(IntegerVersioning.class);

private static final IntegerVersioning DEFAULT_INSTANCE = new IntegerVersioning();
private static final IntegerVersioning DEFAULT_INSTANCE = new IntegerVersioning();

public static IntegerVersioning getDefault() {
return DEFAULT_INSTANCE;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/de/bsi/secvisogram/csaf_cms_backend/rest/MainController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
1 change: 0 additions & 1 deletion ...n/java/de/bsi/secvisogram/csaf_cms_backend/rest/response/AdvisoryInformationResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package de.bsi.secvisogram.csaf_cms_backend.rest.response;

import com.fasterxml.jackson.annotation.JsonIgnore;
import de.bsi.secvisogram.csaf_cms_backend.model.WorkflowState;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/bsi/secvisogram/csaf_cms_backend/service/AbstractCliToolService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package de.bsi.secvisogram.csaf_cms_backend.service;

import com.oracle.truffle.js.runtime.SuppressFBWarnings;
import de.bsi.secvisogram.csaf_cms_backend.exception.CsafException;
import de.bsi.secvisogram.csaf_cms_backend.exception.CsafExceptionKey;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/de/bsi/secvisogram/csaf_cms_backend/validator/ValidatorServiceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
Expand All @@ -21,6 +22,7 @@
import org.springframework.web.reactive.function.client.WebClientRequestException;
import org.springframework.web.reactive.function.client.WebClientResponseException;

@Configuration
public class ValidatorServiceClient {

private static final Logger LOG = LoggerFactory.getLogger(ValidatorServiceClient.class);
Expand Down
7 changes: 0 additions & 7 deletions src/test/java/de/bsi/secvisogram/csaf_cms_backend/json/AdvisoryWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,7 @@
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoField;
import java.time.temporal.Temporal;
import java.time.temporal.TemporalAccessor;
import java.time.temporal.TemporalField;
import java.time.temporal.TemporalUnit;
import java.time.temporal.ValueRange;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/de/bsi/secvisogram/csaf_cms_backend/mustache/JavascriptExporterNoLogoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package de.bsi.secvisogram.csaf_cms_backend.mustache;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalToCompressingWhiteSpace;

import java.io.IOException;

import org.junit.jupiter.api.Assertions;
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/de/bsi/secvisogram/csaf_cms_backend/mustache/JavascriptExporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
import static de.bsi.secvisogram.csaf_cms_backend.mustache.JavascriptExporter.determineMediaTypeOfLogo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.equalToCompressingWhiteSpace;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.io.IOException;
import java.nio.file.Path;

import de.bsi.secvisogram.csaf_cms_backend.CouchDBExtension;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/de/bsi/secvisogram/csaf_cms_backend/rest/AdvisoryControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.test.web.servlet.MockMvc;

@WebMvcTest(AdvisoryController.class)
Expand All @@ -66,10 +66,10 @@ public class AdvisoryControllerTest {
@Autowired
private MockMvc mockMvc;

@MockBean
@MockitoBean
private AdvisoryService advisoryService;

@MockBean
@MockitoBean
private DocumentTemplateService templateService;

@Autowired
Expand Down
18 changes: 10 additions & 8 deletions ...est/java/de/bsi/secvisogram/csaf_cms_backend/service/AdvisoryServiceExportNoLogoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,24 @@
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;

import de.bsi.secvisogram.csaf_cms_backend.CouchDBExtension;
import de.bsi.secvisogram.csaf_cms_backend.config.CsafRoles;
import de.bsi.secvisogram.csaf_cms_backend.exception.CsafException;
import de.bsi.secvisogram.csaf_cms_backend.model.ExportFormat;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.IOException;
import java.nio.file.Path;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.bean.override.mockito.MockitoBean;

import de.bsi.secvisogram.csaf_cms_backend.CouchDBExtension;
import de.bsi.secvisogram.csaf_cms_backend.config.CsafRoles;
import de.bsi.secvisogram.csaf_cms_backend.exception.CsafException;
import de.bsi.secvisogram.csaf_cms_backend.model.ExportFormat;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

/**
* Test for the Advisory service. The required CouchDB container is started in the CouchDBExtension.
Expand All @@ -36,10 +38,10 @@ public class AdvisoryServiceExportNoLogoTest {
@Autowired
private AdvisoryService advisoryService;

@MockBean
@MockitoBean
private PandocService pandocService;

@MockBean
@MockitoBean
private WeasyprintService weasyprintService;


Expand Down
78 changes: 52 additions & 26 deletions src/test/java/de/bsi/secvisogram/csaf_cms_backend/service/AdvisoryServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package de.bsi.secvisogram.csaf_cms_backend.service;

import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisoryAuditTrailField.*;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisoryAuditTrailField.ADVISORY_ID;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisoryAuditTrailField.DIFF;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisoryAuditTrailField.DOC_VERSION;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisoryAuditTrailField.NEW_WORKFLOW_STATE;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisoryAuditTrailField.OLD_DOC_VERSION;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisoryAuditTrailField.OLD_WORKFLOW_STATE;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AuditTrailField.CHANGE_TYPE;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.AuditTrailField.CREATED_AT;
import static de.bsi.secvisogram.csaf_cms_backend.couchdb.CouchDBFilterCreator.expr2CouchDBFilter;
Expand All @@ -11,31 +16,16 @@
import static de.bsi.secvisogram.csaf_cms_backend.model.filter.OperatorExpression.equal;
import static java.util.Comparator.comparing;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.when;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
import de.bsi.secvisogram.csaf_cms_backend.CouchDBExtension;
import de.bsi.secvisogram.csaf_cms_backend.config.CsafRoles;
import de.bsi.secvisogram.csaf_cms_backend.couchdb.*;
import de.bsi.secvisogram.csaf_cms_backend.exception.CsafException;
import de.bsi.secvisogram.csaf_cms_backend.json.AdvisoryWrapper;
import de.bsi.secvisogram.csaf_cms_backend.json.ObjectType;
import de.bsi.secvisogram.csaf_cms_backend.json.TrackingIdCounter;
import de.bsi.secvisogram.csaf_cms_backend.model.ChangeType;
import de.bsi.secvisogram.csaf_cms_backend.model.ExportFormat;
import de.bsi.secvisogram.csaf_cms_backend.model.WorkflowState;
import de.bsi.secvisogram.csaf_cms_backend.rest.request.CreateAdvisoryRequest;
import de.bsi.secvisogram.csaf_cms_backend.rest.request.CreateCommentRequest;
import de.bsi.secvisogram.csaf_cms_backend.rest.response.*;
import de.bsi.secvisogram.csaf_cms_backend.validator.ValidatorServiceClient;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
Expand All @@ -44,7 +34,14 @@
import java.time.Instant;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.UUID;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
Expand All @@ -54,7 +51,6 @@
import org.springframework.boot.info.BuildProperties;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.security.access.AccessDeniedException;
import org.springframework.security.authentication.TestingAuthenticationToken;
Expand All @@ -64,6 +60,36 @@
import org.springframework.security.web.authentication.switchuser.SwitchUserGrantedAuthority;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.bean.override.mockito.MockitoBean;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;

import de.bsi.secvisogram.csaf_cms_backend.CouchDBExtension;
import de.bsi.secvisogram.csaf_cms_backend.config.CsafRoles;
import de.bsi.secvisogram.csaf_cms_backend.couchdb.AdvisorySearchField;
import de.bsi.secvisogram.csaf_cms_backend.couchdb.CouchDbField;
import de.bsi.secvisogram.csaf_cms_backend.couchdb.DatabaseException;
import de.bsi.secvisogram.csaf_cms_backend.couchdb.DbField;
import de.bsi.secvisogram.csaf_cms_backend.couchdb.IdNotFoundException;
import de.bsi.secvisogram.csaf_cms_backend.exception.CsafException;
import de.bsi.secvisogram.csaf_cms_backend.json.AdvisoryWrapper;
import de.bsi.secvisogram.csaf_cms_backend.json.ObjectType;
import de.bsi.secvisogram.csaf_cms_backend.json.TrackingIdCounter;
import de.bsi.secvisogram.csaf_cms_backend.model.ChangeType;
import de.bsi.secvisogram.csaf_cms_backend.model.ExportFormat;
import de.bsi.secvisogram.csaf_cms_backend.model.WorkflowState;
import de.bsi.secvisogram.csaf_cms_backend.rest.request.CreateAdvisoryRequest;
import de.bsi.secvisogram.csaf_cms_backend.rest.request.CreateCommentRequest;
import de.bsi.secvisogram.csaf_cms_backend.rest.response.AdvisoryInformationResponse;
import de.bsi.secvisogram.csaf_cms_backend.rest.response.AdvisoryResponse;
import de.bsi.secvisogram.csaf_cms_backend.rest.response.AnswerInformationResponse;
import de.bsi.secvisogram.csaf_cms_backend.rest.response.CommentInformationResponse;
import de.bsi.secvisogram.csaf_cms_backend.rest.response.CommentResponse;
import de.bsi.secvisogram.csaf_cms_backend.validator.ValidatorServiceClient;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;

/**
* Test for the Advisory service. The required CouchDB container is started in the CouchDBExtension.
Expand All @@ -83,10 +109,10 @@ public class AdvisoryServiceTest {
@Autowired
private AdvisoryService advisoryService;

@MockBean
@MockitoBean
private PandocService pandocService;

@MockBean
@MockitoBean
private WeasyprintService weasyprintService;


Expand Down