Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ class MyConfigTest {
@Test
void configurationTest() {
contextRunner
.withBean(DbsWebClientConfiguration.class)
.withBean(WebClientAutoConfiguration.class)
.withBean(DbsApiClientsAutoConfiguration.class)
.withBean(InterServiceWebClientConfiguration.class)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal access token.
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of sonar analysis

- name: Set up JDK 21
- name: Set up JDK 25
uses: actions/setup-java@v4
with:
java-version: 21
java-version: 25
distribution: temurin
cache: maven

Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog
All notable changes to this project will be documented in this file.

## [10.0.0]
### Changed
- Align Spring Boot and Spring Cloud versions with Service SDK 21.0.1 managed stack.
- Remove local Spring metadata plugin and Azure Service Bus version overrides in favor of the Service SDK 21.0.1 managed dependency chain.

## [9.17.0]
### Changed
Improve Investment asset universe price setup
Expand All @@ -9,6 +14,8 @@ Improve Investment asset universe price setup
### Added
- Add investmentPortfolios ingestion support to BaseProductGroup (similar to investmentAccounts)
## [9.15.0]

## [9.14.0]
### Changed
- Remove custom workaround to connect with Investment service

Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ volumes:
services:
# External Dependencies
mysql:
image: mysql:8.0.31
image: mysql:8.4.7
ports:
- "3306:3306"
environment:
Expand All @@ -85,7 +85,7 @@ services:
retries: 5

wiremock:
image: wiremock/wiremock:2.35.1-1
image: wiremock/wiremock:3.0.1
ports:
- "9000:8080"
command:
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/identity/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN ["java", "-cp", "/opt/keycloak/lib/quarkus-run.jar:/opt/keycloak/lib/bootstr

# -------------------------------------------------------------------------------------------
# The production image build; for example, is based on the `distroless` Java image
FROM gcr.io/distroless/java21-debian12
FROM gcr.io/distroless/java25-debian13@sha256:6c9412db880a8bd7227ce85593e27df931b59a39ad89559fa50d3ba06a49dd00

# Copy the files prepared in the previous build-stage
COPY --from=auth-server-builder /opt/keycloak /opt/keycloak
Expand Down
44 changes: 36 additions & 8 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
<parent>
<groupId>com.backbase.buildingblocks</groupId>
<artifactId>backbase-parent</artifactId>
<version>20.1.0</version>
<version>21.0.1</version>
<relativePath/>
</parent>

<groupId>com.backbase.stream</groupId>
<artifactId>stream-services</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>

<packaging>pom</packaging>
<name>Stream :: Services</name>
Expand Down Expand Up @@ -40,11 +40,12 @@
</modules>

<properties>
<java.version>21</java.version>
<ssdk.version>20.1.0</ssdk.version>
<java.version>25</java.version>
<ssdk.version>21.0.1</ssdk.version>
<backbase-bom.version>2026.03-LTS</backbase-bom.version>
<boat-maven-plugin.version>0.17.66</boat-maven-plugin.version>
<boat-maven-plugin.version>0.18.1</boat-maven-plugin.version>
<backbase.portfolio.version>4.7.0</backbase.portfolio.version>
<org.jetbrainsannotations.version>26.1.0</org.jetbrainsannotations.version>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
<openapi-generator-maven-plugin.language>spring</openapi-generator-maven-plugin.language>
<openapi-generator-maven-plugin.library>spring-boot</openapi-generator-maven-plugin.library>
Expand All @@ -70,7 +71,7 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>22.0.0</version>
<version>${org.jetbrainsannotations.version}</version>
</dependency>
<dependency>
<groupId>com.backbase</groupId>
Expand All @@ -97,6 +98,13 @@
<groupId>com.backbase.oss</groupId>
<artifactId>boat-maven-plugin</artifactId>
<version>${boat-maven-plugin.version}</version>
<configuration>
<configOptions>
<useSpringBoot4>true</useSpringBoot4>
<useJackson3>true</useJackson3>
<openApiNullable>false</openApiNullable>
</configOptions>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -124,8 +132,28 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<release>${java.version}</release>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</path>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>${lombok-mapstruct-binding.version}</version>
</path>
<path>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
</path>
</annotationProcessorPaths>
<compilerArgs>
<arg>-parameters</arg>
<arg>-Amapstruct.verbose=true</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion stream-access-control/access-control-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.backbase.stream</groupId>
<artifactId>stream-access-control</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>access-control-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1863,7 +1863,7 @@ private Flux<FunctionGroupItem> getFunctionGroups(StreamTask streamTask, Service
}

private void handleError(WebClientResponseException badRequest) {
log.warn("Error executing request: [{}] {}", badRequest.getRawStatusCode(),
log.warn("Error executing request: [{}] {}", badRequest.getStatusText(),
badRequest.getResponseBodyAsString());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import com.backbase.buildingblocks.webclient.InterServiceWebClientConfiguration;
import com.backbase.stream.clients.autoconfigure.DbsApiClientsAutoConfiguration;
import com.backbase.stream.service.AccessGroupService;
import com.backbase.stream.webclient.configuration.DbsWebClientConfiguration;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;

Expand All @@ -18,6 +19,7 @@ class AccessControlConfigurationTest {
@Test
void configurationTest() {
contextRunner
.withBean(DbsWebClientConfiguration.class)
.withBean(WebClientAutoConfiguration.class)
.withBean(DbsApiClientsAutoConfiguration.class)
.withBean(InterServiceWebClientConfiguration.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import wiremock.org.checkerframework.common.value.qual.ArrayLenRange;

@ExtendWith(MockitoExtension.class)
class AccessGroupServiceTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import com.backbase.buildingblocks.webclient.InterServiceWebClientConfiguration;
import com.backbase.stream.clients.autoconfigure.DbsApiClientsAutoConfiguration;
import com.backbase.stream.configuration.AccessControlConfiguration;
import com.backbase.stream.webclient.configuration.DbsWebClientConfiguration;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.web.reactive.function.client.WebClientResponseException;
Expand All @@ -20,6 +21,7 @@ public class BatchResponseUtilsTest {
@Test
void shouldThrowExceptionWhenBatchIsInconsistentByDefault() {
contextRunner
.withBean(DbsWebClientConfiguration.class)
.withBean(WebClientAutoConfiguration.class)
.withBean(DbsApiClientsAutoConfiguration.class)
.withBean(InterServiceWebClientConfiguration.class)
Expand All @@ -41,6 +43,7 @@ void shouldThrowExceptionWhenBatchIsInconsistentByDefault() {
@Test
void shouldNotThrowExceptionWhenBatchIsInconsistentIfDisabled() {
contextRunner
.withBean(DbsWebClientConfiguration.class)
.withBean(WebClientAutoConfiguration.class)
.withBean(DbsApiClientsAutoConfiguration.class)
.withBean(InterServiceWebClientConfiguration.class)
Expand Down
2 changes: 1 addition & 1 deletion stream-access-control/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.backbase.stream</groupId>
<artifactId>stream-services</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>stream-access-control</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion stream-approvals/approvals-bootstrap-task/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.backbase.stream</groupId>
<artifactId>stream-task-starter-parent</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>
<relativePath>../../stream-sdk/stream-starter-parents/stream-task-starter-parent</relativePath>
</parent>

Expand All @@ -17,6 +17,7 @@
<properties>
<checkstyle.disable.checks>true</checkstyle.disable.checks>
<archunit.backbase.LoggingRules.skip>true</archunit.backbase.LoggingRules.skip>
<archunit.skip>true</archunit.skip>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion stream-approvals/approvals-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.backbase.stream</groupId>
<artifactId>stream-approvals</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>approvals-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion stream-approvals/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.backbase.stream</groupId>
<artifactId>stream-services</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>stream-approvals</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion stream-audiences/audiences-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.backbase.stream</groupId>
<artifactId>stream-audiences</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>audiences-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ private static void addLobHeader(ApiClient apiClient, CustomerOnboardedRequest r
if (apiClient == null) {
return;
}
if (request.getUserKind() == UserKindEnum.RETAILCUSTOMER) {
if (request.getUserKind() == UserKindEnum.RETAIL_CUSTOMER) {
log.debug("adding header for retail customer");
apiClient.addDefaultHeader(HttpCommunicationConstants.LINE_OF_BUSINESS, LineOfBusiness.RETAIL.getValue());
} else if (request.getUserKind() == UserKindEnum.SME) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private UserKindSegmentationTask createTask() {
task.setCustomerOnboardedRequest(
new CustomerOnboardedRequest()
.internalUserId("internal-id")
.userKind(UserKindEnum.RETAILCUSTOMER)
.userKind(UserKindEnum.RETAIL_CUSTOMER)
);
return task;
}
Expand Down
2 changes: 1 addition & 1 deletion stream-audiences/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.backbase.stream</groupId>
<artifactId>stream-services</artifactId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>stream-audiences</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion stream-compositions/api/cursors-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>api</artifactId>
<groupId>com.backbase.stream.compositions</groupId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>cursors-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>cursors-api</artifactId>
<groupId>com.backbase.stream.compositions</groupId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -17,6 +17,7 @@
<findMainClass.skip>true</findMainClass.skip>
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
<sonar.skip>true</sonar.skip>
<archunit.skip>true</archunit.skip>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>integrations-api</artifactId>
<groupId>com.backbase.stream.compositions</groupId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<groupId>com.backbase.stream.compositions.api</groupId>
Expand Down Expand Up @@ -42,7 +42,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>copy-realm</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>integrations-api</artifactId>
<groupId>com.backbase.stream.compositions</groupId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<groupId>com.backbase.stream.compositions.api</groupId>
Expand Down
2 changes: 1 addition & 1 deletion stream-compositions/api/integrations-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>api</artifactId>
<groupId>com.backbase.stream.compositions</groupId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<artifactId>integrations-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>integrations-api</artifactId>
<groupId>com.backbase.stream.compositions</groupId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<groupId>com.backbase.stream.compositions.api</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>integrations-api</artifactId>
<groupId>com.backbase.stream.compositions</groupId>
<version>9.18.0</version>
<version>10.0.0</version>
</parent>

<groupId>com.backbase.stream.compositions.api</groupId>
Expand Down
Loading
Loading