Skip to content

Commit 97ddbb1

Browse files
author
Hryhorii Hevorkian
committed
Feature/vst bump dependencies
1 parent c92c572 commit 97ddbb1

File tree

8 files changed

+46
-30
lines changed

8 files changed

+46
-30
lines changed

‎doc/release-notes/v5.1.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ v.5.1
44

55
#### Features:
66

7-
* Version of Spring Boot was bumped to 3.0.13.
7+
* Version of Spring Boot was bumped to 3.2.0.
88
* Version of org.json was bumped to 20231013.
9-
* Code coverage was increased, more unit tests were added, code smells were fixed
9+
* Version of spring-cloud-starter-openfeign was bumped to 4.1.0.
10+
* Version of spring-security was bumped to 6.1.3.
11+
* Version of springdoc-openapi-ui was bumped to 2.3.0.
12+
* Version of jackson-annotations was bumped to 2.16.1.
13+
* Code coverage was increased, more unit tests were added, code smells were fixed.

‎ledgers-app/src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ spring:
6868
hibernate:
6969
ddl-auto: validate
7070
properties:
71-
hibernate.globally_quoted_identifiers: true
71+
hibernate.globally_quoted_identifiers: false
7272
hibernate.jdbc.lob.non_contextual_creation: true
7373
hibernate.naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
7474
hibernate.jdbc.batch_size: 100

‎ledgers-cleanup-service/src/test/java/de/adorsys/ledgers/cleanup/repository/DepositAccountCleanupRepositoryImplTest.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
package de.adorsys.ledgers.cleanup.repository;
77

88
import de.adorsys.ledgers.cleanup.exception.CleanupModuleException;
9+
import jakarta.persistence.EntityManager;
10+
import jakarta.persistence.Query;
911
import org.apache.commons.io.IOUtils;
1012
import org.junit.jupiter.api.BeforeEach;
1113
import org.junit.jupiter.api.Test;
@@ -17,14 +19,13 @@
1719
import org.springframework.core.io.Resource;
1820
import org.springframework.core.io.ResourceLoader;
1921

20-
import jakarta.persistence.EntityManager;
21-
import jakarta.persistence.Query;
2222
import java.io.IOException;
2323
import java.io.InputStream;
2424
import java.nio.charset.StandardCharsets;
2525
import java.time.LocalDateTime;
2626

27-
import static org.junit.jupiter.api.Assertions.*;
27+
import static org.junit.jupiter.api.Assertions.assertThrows;
28+
import static org.junit.jupiter.api.Assertions.assertTrue;
2829
import static org.mockito.Mockito.*;
2930

3031
@ExtendWith(MockitoExtension.class)
@@ -143,22 +144,25 @@ void deletePostings_error() throws IOException {
143144
void rollBackBranch() throws CleanupModuleException, IOException {
144145
LocalDateTime now = LocalDateTime.now();
145146
ArgumentCaptor<Integer> paramKeyCaptor = ArgumentCaptor.forClass(Integer.class);
146-
ArgumentCaptor<LocalDateTime> paramValueCaptor = ArgumentCaptor.forClass(LocalDateTime.class);
147+
ArgumentCaptor<LocalDateTime> dateTimeParamValueCaptor = ArgumentCaptor.forClass(LocalDateTime.class);
148+
ArgumentCaptor<String> stringParamValueCaptor = ArgumentCaptor.forClass(String.class);
147149

148150
when(resourceLoader.getResource("classpath:sql/rollBackBranch.sql")).thenReturn(resource);
149151
when(resource.getInputStream()).thenReturn(targetStream);
150152
when(entityManager.createNativeQuery(QUERY)).thenReturn(nativeQuery);
151153

152154
repository.rollBackBranch(BRANCH, now);
153155

154-
verify(nativeQuery, times(2)).setParameter(paramKeyCaptor.capture(), paramValueCaptor.capture());
156+
verify(nativeQuery, times(1)).setParameter(paramKeyCaptor.capture(), dateTimeParamValueCaptor.capture());
157+
verify(nativeQuery, times(1)).setParameter(paramKeyCaptor.capture(), stringParamValueCaptor.capture());
158+
155159
verify(nativeQuery, times(1)).executeUpdate();
156160

157161
assertTrue(paramKeyCaptor.getAllValues().contains(1));
158162
assertTrue(paramKeyCaptor.getAllValues().contains(2));
159163

160-
assertTrue(paramValueCaptor.getAllValues().contains(BRANCH));
161-
assertTrue(paramValueCaptor.getAllValues().contains(now));
164+
assertTrue(dateTimeParamValueCaptor.getAllValues().contains(now));
165+
assertTrue(stringParamValueCaptor.getAllValues().contains(BRANCH));
162166
}
163167

164168
@Test

‎ledgers-deposit-account/ledgers-deposit-account-repository/src/main/java/de/adorsys/ledgers/deposit/db/domain/Payment.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class Payment {
4949
* Is used for regular payments when User is eager to have them executed at certain time (not before)
5050
*/
5151
//@Convert(converter = LocalTimeConverter.class)
52+
@Column(columnDefinition = "TIME")
5253
private LocalTime requestedExecutionTime;
5354

5455
@Enumerated(EnumType.STRING)

‎ledgers-middleware/ledgers-middleware-service-impl/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
<groupId>org.springframework.boot</groupId>
126126
<artifactId>spring-boot-starter-test</artifactId>
127127
<scope>test</scope>
128+
<exclusions>
129+
<exclusion>
130+
<groupId>com.vaadin.external.google</groupId>
131+
<artifactId>android-json</artifactId>
132+
</exclusion>
133+
</exclusions>
128134
</dependency>
129135

130136
<dependency>

‎ledgers-sca/ledgers-sca-service-impl/src/main/java/de/adorsys/ledgers/sca/service/impl/sender/AppOtpSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class AppOtpSender implements SCASender<AppScaMessage> {
3131
@Override
3232
public boolean send(AppScaMessage message) {
3333
try {
34-
HttpMethod method = Optional.ofNullable(HttpMethod.resolve(message.getSocketServiceHttpMethod()))
34+
HttpMethod method = Optional.of(HttpMethod.valueOf(message.getSocketServiceHttpMethod()))
3535
.orElseThrow(() -> ScaModuleException.buildScaSenderException("Could not parse SocketServiceHttpMethod"));
3636
HttpEntity<AppScaMessage> httpEntity = new HttpEntity<>(message);
3737
ResponseEntity<Void> exchange = template.exchange(message.getSocketServicePath(), method, httpEntity, Void.class);

‎ledgers-sca/ledgers-sca-service-impl/src/main/java/de/adorsys/ledgers/sca/service/impl/sender/PushOtpSender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public boolean send(PushScaMessage message) {
3333

3434
try {
3535
HttpEntity<String> httpEntity = new HttpEntity<>(message.getMessage());
36-
HttpMethod httpMethod = Optional.ofNullable(HttpMethod.resolve(message.getHttpMethod()))
36+
HttpMethod httpMethod = Optional.of(HttpMethod.valueOf(message.getHttpMethod()))
3737
.orElseThrow(() -> ScaModuleException.buildScaSenderException("Could not resolve HttpMethod for PsuhOTP Sender " + message.getHttpMethod()));
3838
ResponseEntity<Void> exchange = template.exchange(message.getUrl(), httpMethod, httpEntity, Void.class);
3939
return exchange.getStatusCode().is2xxSuccessful();

‎pom.xml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -105,27 +105,27 @@
105105
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
106106

107107
<!-- Maven plugins-->
108-
<maven-enforcer-plugin.version>3.4.0</maven-enforcer-plugin.version>
109-
<maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
108+
<maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
109+
<maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
110110
<maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
111-
<spring-boot-maven-plugin.version>3.0.7</spring-boot-maven-plugin.version>
111+
<spring-boot-maven-plugin.version>3.2.0</spring-boot-maven-plugin.version>
112112
<sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
113-
<jacoco-maven-plugin.version>0.8.10</jacoco-maven-plugin.version>
114-
<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
115-
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
113+
<jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>
114+
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
115+
<maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
116116
<maven-source-plugin.version>3.0.1</maven-source-plugin.version>
117117
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
118118
<maven-pmd-plugin.version>3.21.0</maven-pmd-plugin.version>
119119

120120
<!-- Spring-related versions -->
121-
<spring-boot-dependencies.version>3.0.13</spring-boot-dependencies.version>
122-
<spring-cloud-starter-openfeign.version>4.0.4</spring-cloud-starter-openfeign.version>
123-
<spring-security.version>6.0.5</spring-security.version>
121+
<spring-boot-dependencies.version>3.2.0</spring-boot-dependencies.version>
122+
<spring-cloud-starter-openfeign.version>4.1.0</spring-cloud-starter-openfeign.version>
123+
<spring-security.version>6.1.3</spring-security.version>
124124
<spring-plugin.version>3.0.0</spring-plugin.version>
125-
<spring-test.version>6.0.7</spring-test.version>
125+
<spring-test.version>6.1.3</spring-test.version>
126126

127127
<!-- Other versions -->
128-
<springdoc-openapi-ui.version>2.2.0</springdoc-openapi-ui.version>
128+
<springdoc-openapi-ui.version>2.3.0</springdoc-openapi-ui.version>
129129
<commons-collections4.version>4.3</commons-collections4.version>
130130
<commons-io.version>2.8.0</commons-io.version>
131131
<jetbrains.annotations.version>15.0</jetbrains.annotations.version>
@@ -140,17 +140,17 @@
140140
<datecalc-jdk8.version>1.4.0</datecalc-jdk8.version>
141141
<jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
142142
<json.version>20231013</json.version>
143-
<jackson-annotations.version>2.13.2</jackson-annotations.version>
143+
<jackson-annotations.version>2.15.3</jackson-annotations.version>
144144
<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
145145
<feign-slf4j.version>10.7.4</feign-slf4j.version>
146-
<testcontainers.version>1.17.3</testcontainers.version>
146+
<testcontainers.version>1.19.3</testcontainers.version>
147147
<testcontainers-keycloak.version>1.3.3</testcontainers-keycloak.version>
148148
<jboss-jaxrs-api_2.0_spec.version>1.0.1.Final</jboss-jaxrs-api_2.0_spec.version>
149149
<jboss-logging.version>3.3.1.Final</jboss-logging.version>
150150
<classgraph.version>4.8.139</classgraph.version>
151151

152152
<!-- Test versions -->
153-
<junit-jupiter-api.version>5.9.3</junit-jupiter-api.version>
153+
<junit-jupiter-api.version>5.10.2</junit-jupiter-api.version>
154154
<mockito.version>5.2.0</mockito.version>
155155
<guava.version>32.0.0-jre</guava.version>
156156
<hamcrest-library.version>1.3</hamcrest-library.version>
@@ -160,11 +160,11 @@
160160
<!-- automatically run annotation processors within the incremental compilation -->
161161
<m2e.apt.activation>jdt_apt</m2e.apt.activation>
162162
<slf4j.version>2.0.9</slf4j.version>
163-
<nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>
164-
<liquibase.version>4.9.0</liquibase.version>
163+
<nimbus-jose-jwt.version>9.25.6</nimbus-jose-jwt.version>
164+
<liquibase.version>4.25.1</liquibase.version>
165165
<subethasmtp.version>3.1.7</subethasmtp.version>
166-
<jackson.version>2.13.2</jackson.version>
167-
<lombok.version>1.18.24</lombok.version>
166+
<jackson.version>2.15.3</jackson.version>
167+
<lombok.version>1.18.30</lombok.version>
168168
<jasypt.version>1.9.3</jasypt.version>
169169

170170
<!--Sonar -->
@@ -557,6 +557,7 @@
557557
<artifactId>maven-compiler-plugin</artifactId>
558558
<version>${maven-compiler-plugin.version}</version>
559559
<configuration>
560+
<parameters>true</parameters>
560561
<source>${java.version}</source>
561562
<target>${java.version}</target>
562563
<annotationProcessorPaths>

0 commit comments

Comments
 (0)