Skip to content

Commit f8172e7

Browse files
authored
Merge pull request #283 from Backbase/ssdk-18.0.1-update
Ssdk 18.0.1 update
2 parents d093a2b + 1bebc0f commit f8172e7

File tree

24 files changed

+55
-100
lines changed

24 files changed

+55
-100
lines changed

.github/CODEOWNERS

+2-29
Original file line numberDiff line numberDiff line change
@@ -5,33 +5,6 @@
55
# the repo. Unless a later match takes precedence,
66
# @global-owner1 and @global-owner2 will be requested for
77
# review when someone opens a pull request.
8-
* @Backbase/backend-leadership
8+
* @Backbase/backend-leadership
9+
* @Backbase/befound
910

10-
# Order is important; the last matching pattern takes the most
11-
# precedence. When someone opens a pull request that only
12-
# modifies JS files, only @js-owner and not the global
13-
# owner(s) will be requested for a review.
14-
*.js @js-owner
15-
16-
# You can also use email addresses if you prefer. They'll be
17-
# used to look up users just like we do for commit author
18-
# emails.
19-
#*.go docs@example.com
20-
21-
# In this example, @doctocat owns any files in the build/logs
22-
# directory at the root of the repository and any of its
23-
# subdirectories.
24-
#/build/logs/ @doctocat
25-
26-
# The `docs/*` pattern will match files like
27-
# `docs/getting-started.md` but not further nested files like
28-
# `docs/build-app/troubleshooting.md`.
29-
#docs/* docs@example.com
30-
31-
# In this example, @octocat owns any file in an apps directory
32-
# anywhere in your repository.
33-
#apps/ @octocat
34-
35-
# In this example, @doctocat owns any file in the `/docs`
36-
# directory in the root of your repository.
37-
#/docs/ @doctocat

.github/workflows/maven-publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@v2
21-
- name: Set up JDK 17
21+
- name: Set up JDK 21
2222
uses: actions/setup-java@v2
2323
with:
24-
java-version: '17'
24+
java-version: '21'
2525
distribution: 'adopt'
2626
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
2727
settings-path: ${{ github.workspace }} # location for the settings.xml file

.github/workflows/maven-verify.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
# restore-keys: |
2525
# ${{ runner.os }}-maven-
2626
- uses: actions/setup-java@v2
27-
name: Set up JDK 17
27+
name: Set up JDK 21
2828
with:
29-
java-version: '17'
29+
java-version: '21'
3030
distribution: 'adopt'
3131
# - name: Set up Apache Maven Central
3232
# uses: actions/setup-java@v2
@@ -46,7 +46,7 @@ jobs:
4646
name: Build and test project
4747
- run: mkdir staging && cp services/product/target/*.jar staging
4848
name: Move and upload the jar
49-
- uses: actions/upload-artifact@v2
49+
- uses: actions/upload-artifact@v4
5050
with:
5151
name: Package
5252
path: staging

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The following are the initially required software pieces:
8888

8989
2. **Git**: it can be downloaded and installed from https://git-scm.com/downloads.
9090

91-
3. **Java 17 EA**: it can be downloaded and installed from https://jdk.java.net/17/.
91+
3. **Java 21 EA**: it can be downloaded and installed from https://jdk.java.net/21/.
9292

9393
4. **Spring Boot Initializer**: This *Initializer* generates *spring* boot project with just what you need to start quickly! Start from here https://start.spring.io/.
9494

TESTCONTAINERS.md

+10-20
Original file line numberDiff line numberDiff line change
@@ -51,33 +51,23 @@ Integrate the container management into the build. Just start the database conta
5151
Use TestContainers and manage the database in your test code.
5252
Let's review this approach more in deep and what steps we need to apply:
5353

54-
#### Add the TestContainers dependency, test scoped
55-
56-
<dependency>
57-
<groupId>org.testcontainers</groupId>
58-
<artifactId>testcontainers</artifactId>
59-
<version>${testcontainers.version}</version>
60-
<scope>test</scope>
61-
</dependency>
54+
#### TestContainers dependency is managed by spring boot
6255

6356
#### Add the database module you want to test, e.g. MySQL, Oracle, MSSQL, MariaDB:
6457

6558
<dependency>
6659
<groupId>org.testcontainers</groupId>
6760
<artifactId>mysql</artifactId>
68-
<version>${testcontainers.version}</version>
6961
<scope>test</scope>
7062
</dependency>
7163
<dependency>
7264
<groupId>org.testcontainers</groupId>
7365
<artifactId>oracle-xe</artifactId>
74-
<version>${testcontainers.version}</version>
7566
<scope>test</scope>
7667
</dependency>
7768
<dependency>
7869
<groupId>org.testcontainers</groupId>
7970
<artifactId>mssqlserver</artifactId>
80-
<version>${testcontainers.version}</version>
8171
<scope>test</scope>
8272
</dependency>
8373

@@ -126,18 +116,18 @@ As long as we have TestContainers and the appropriate JDBC driver on your classp
126116
- For Spring Boot (Before version 2.3.0) you need to specify the driver manually
127117
`spring.datasource.driver-class-name=org.testcontainers.jdbc.ContainerDatabaseDriver`
128118

129-
Original URL: `jdbc:mysql:5.7://somehostname:someport/databasename`
119+
Original URL: `jdbc:mysql:8.0.36://somehostname:someport/databasename`
130120

131121
Insert `tc:` after `jdbc:` as follows. Note that the hostname, port and database name will be ignored; you can leave these as-is or set them to any value.
132122

133-
TestContainers URL with a specific version: `jdbc:tc:mysql:5.7:///databasename`
123+
TestContainers URL with a specific version: `jdbc:tc:mysql:8.0.36:///databasename`
134124

135125
For multiple databases testing we can use different profiles:
136126

137127
# application-mysql.yaml
138128
spring:
139129
datasource:
140-
url: jdbc:tc:mysql:5.7://localhost:3306/dbs
130+
url: jdbc:tc:mysql:8.0.36://localhost:3306/dbs
141131
username: root
142132
password: root
143133
driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver
@@ -155,19 +145,19 @@ For multiple databases testing we can use different profiles:
155145
##### Using a classpath init script
156146
Testcontainers can run an init script after the database container is started, but before your code is given a connection to it. The script must be on the classpath, and is referenced as follows:
157147

158-
`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
148+
`jdbc:tc:mysql:8.0.36:///databasename?TC_INITSCRIPT=somepath/init_mysql.sql`
159149

160150
This is useful if you have a fixed script for setting up database schema, etc.
161151

162152
##### Using an init script from a file
163153
If the init script path is prefixed file:, it will be loaded from a file (relative to the working directory, which will usually be the project root).
164154

165-
`jdbc:tc:mysql:5.7.22:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
155+
`jdbc:tc:mysql:8.0.36:///databasename?TC_INITSCRIPT=file:src/main/resources/init_mysql.sql`
166156

167157
##### Using an init function
168158
Instead of running a fixed script for DB setup, it may be useful to call a Java function that you define. This is intended to allow you to trigger database schema migration tools. To do this, add TC_INITFUNCTION to the URL as follows, passing a full path to the class name and method:
169159

170-
`jdbc:tc:mysql:5.7.22:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
160+
`jdbc:tc:mysql:8.0.36:///databasename?TC_INITFUNCTION=org.testcontainers.jdbc.JDBCDriverTest::sampleInitFunction`
171161

172162
The init function must be a public static method which takes a java.sql.Connection as its only parameter, e.g.
173163

@@ -180,7 +170,7 @@ The init function must be a public static method which takes a java.sql.Connecti
180170
##### Running container in daemon mode
181171
By default database container is being stopped as soon as last connection is closed. There are cases when you might need to start container and keep it running till you stop it explicitly or JVM is shutdown. To do this, add TC_DAEMON parameter to the URL as follows:
182172

183-
`jdbc:tc:mysql:5.7.22:///databasename?TC_DAEMON=true`
173+
`jdbc:tc:mysql:8.0.36:///databasename?TC_DAEMON=true`
184174

185175
With this parameter database container will keep running even when there're no open connections.
186176

@@ -202,14 +192,14 @@ More info: https://www.testcontainers.org/modules/databases/jdbc/
202192
For MySQL databases, it is possible to override configuration settings using resources on the classpath.
203193
Assuming `db/mysql_conf_override` is a directory on the classpath containing `.cnf` files, the following URL can be used:
204194

205-
`jdbc:tc:mysql:5.7:///databasename?TC_MY_CNF=db/mysql_conf_override`
195+
`jdbc:tc:mysql:8.0.36:///databasename?TC_MY_CNF=db/mysql_conf_override`
206196

207197
##### Database container objects
208198
In case you can't use the URL support, or need to fine-tune the container, you can instantiate it yourself.
209199
Add a `@Rule` or `@ClassRule` to your test class, e.g.:
210200

211201
@ClassRule
212-
public static MySQLContainer mysqlSQLContainer = new MySQLContainer("mysql:5.7");
202+
public static MySQLContainer mysqlSQLContainer = new MySQLContainer("mysql:8.0");
213203
214204
static class Initializer
215205
implements ApplicationContextInitializer<ConfigurableApplicationContext> {

api/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
<parent>
77
<groupId>com.backbase.buildingblocks</groupId>
88
<artifactId>backbase-openapi-spec-starter-parent</artifactId>
9-
<version>16.0.1</version>
9+
<version>18.0.1</version>
1010
<relativePath/>
1111
</parent>
1212

1313
<groupId>com.backbase.goldensample</groupId>
1414
<artifactId>api</artifactId>
1515
<packaging>pom</packaging>
16-
<version>2.0.0-SNAPSHOT</version>
16+
<version>3.0.0-SNAPSHOT</version>
1717

1818
<modules>
1919
<module>product-api</module>
@@ -24,7 +24,7 @@
2424

2525
<properties>
2626
<frontend-plugin.version>1.12.1</frontend-plugin.version>
27-
<boat-maven-plugin.version>0.17.24</boat-maven-plugin.version>
27+
<boat-maven-plugin.version>0.17.32</boat-maven-plugin.version>
2828
</properties>
2929

3030
<build>

api/product-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.backbase.goldensample</groupId>
88
<artifactId>api</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>3.0.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>Backbase :: product-api</name>

api/review-service-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.backbase.goldensample</groupId>
88
<artifactId>api</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>3.0.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>Backbase :: review-service-api</name>

api/store-client-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.backbase.goldensample</groupId>
88
<artifactId>api</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>3.0.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>Backbase :: store-client-api</name>

api/store-integration-enricher-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.backbase.goldensample</groupId>
88
<artifactId>api</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>3.0.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<name>Backbase :: store-integration-enricher-api</name>

charts/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<parent>
77
<groupId>com.backbase.goldensample</groupId>
88
<artifactId>backbase-golden-sample</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>3.0.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>charts</artifactId>
13-
<version>2.0.0-SNAPSHOT</version>
13+
<version>3.0.0-SNAPSHOT</version>
1414
<name>backbase-golden-sample-chart</name>
1515
<description>Demo project for Backbase Backend Best Practices</description>
1616
<packaging>pom</packaging>

database/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>com.backbase.goldensample</groupId>
88
<artifactId>backbase-golden-sample</artifactId>
9-
<version>2.0.0-SNAPSHOT</version>
9+
<version>3.0.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>database</artifactId>

database/product-db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.backbase.goldensample</groupId>
99
<artifactId>database</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>3.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>product-db</artifactId>

database/review-db/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.backbase.goldensample</groupId>
99
<artifactId>database</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>3.0.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>review-db</artifactId>

docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ services:
5252
- "61614:61614"
5353

5454
mysql:
55-
image: mysql:5.7.18
55+
image: mysql:8.0.36
5656
# Set max_allowed_packet to 512M for provisioning
5757
command: --max-allowed-packet=512M --performance-schema=FALSE --transaction-isolation=READ-COMMITTED --init-connect='SET collation_connection=utf8_bin' --init-connect='SET NAMES utf8;' --character-set-server=utf8 --collation-server=utf8_bin --lower-case-table-names=2 --max-connections=500
5858
container_name: demo_mysql

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<parent>
1111
<artifactId>service-sdk-starter-core</artifactId>
1212
<groupId>com.backbase.buildingblocks</groupId>
13-
<version>16.0.1</version>
13+
<version>18.0.1</version>
1414
<relativePath />
1515
</parent>
1616

1717
<groupId>com.backbase.goldensample</groupId>
1818
<artifactId>backbase-golden-sample</artifactId>
19-
<version>2.0.0-SNAPSHOT</version>
19+
<version>3.0.0-SNAPSHOT</version>
2020
<name>backbase-golden-example</name>
2121
<description>Demo project for Backbase Backend Best Practices</description>
2222
<packaging>pom</packaging>

services/pom.xml

+3-11
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<groupId>com.backbase.goldensample</groupId>
77
<artifactId>backbase-golden-sample</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>3.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>services</artifactId>
12-
<version>2.0.0-SNAPSHOT</version>
12+
<version>3.0.0-SNAPSHOT</version>
1313
<packaging>pom</packaging>
1414

1515
<modules>
@@ -20,8 +20,7 @@
2020

2121
<properties>
2222
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
23-
<testcontainers.version>1.19.1</testcontainers.version>
24-
<boat-maven-plugin.version>0.17.24</boat-maven-plugin.version>
23+
<boat-maven-plugin.version>0.17.32</boat-maven-plugin.version>
2524
<jqno.equalsverifier.version>3.14.1</jqno.equalsverifier.version>
2625
<docker.repo.project>experimental/golden-sample</docker.repo.project>
2726
</properties>
@@ -54,13 +53,6 @@
5453
<artifactId>mysql-connector-j</artifactId>
5554
<version>${mysql.version}</version>
5655
</dependency>
57-
<dependency>
58-
<groupId>org.testcontainers</groupId>
59-
<artifactId>testcontainers-bom</artifactId>
60-
<version>${testcontainers.version}</version>
61-
<type>pom</type>
62-
<scope>import</scope>
63-
</dependency>
6456
</dependencies>
6557
</dependencyManagement>
6658

services/product/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<parent>
66
<groupId>com.backbase.goldensample</groupId>
77
<artifactId>services</artifactId>
8-
<version>2.0.0-SNAPSHOT</version>
8+
<version>3.0.0-SNAPSHOT</version>
99
</parent>
1010

1111
<artifactId>product</artifactId>
12-
<version>2.0.0-SNAPSHOT</version>
12+
<version>3.0.0-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414
<name>Backbase :: product-service</name>
1515

@@ -113,8 +113,8 @@
113113
<scope>test</scope>
114114
</dependency>
115115
<dependency>
116-
<groupId>com.backbase.buildingblocks</groupId>
117-
<artifactId>bb-activemq-broker</artifactId>
116+
<groupId>org.apache.activemq</groupId>
117+
<artifactId>activemq-broker</artifactId>
118118
<scope>test</scope>
119119
</dependency>
120120
<dependency>

services/product/src/test/resources/application-m10y.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ backbase:
44
tenants:
55
- id: org_shop
66
datasource:
7-
url: jdbc:tc:mysql:5.7:///testdb1?TC_MY_CNF=db/mysql_conf_override
7+
url: jdbc:tc:mysql:8.0.36:///testdb1?TC_MY_CNF=db/mysql_conf_override
88
username: test
99
password: test
1010
- id: rebrand_shop
1111
datasource:
12-
url: jdbc:tc:mysql:5.7:///testdb2?TC_MY_CNF=db/mysql_conf_override
12+
url: jdbc:tc:mysql:8.0.36:///testdb2?TC_MY_CNF=db/mysql_conf_override
1313
username: test
1414
password: test
1515
datasource:

0 commit comments

Comments
 (0)