Skip to content

Commit 2db5781

Browse files
andytaelandytael
authored
Version upgrades and fixes (#997)
1 parent 1698668 commit 2db5781

File tree

9 files changed

+46
-22
lines changed

9 files changed

+46
-22
lines changed

‎cloudbank-v4/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ This is an example of the `customer32` application:
428428
...
429429
```
430430
431-
1. Check journal -- DEPOSIT
431+
1. Check journal -- DEPOSIT. Replace '1' with the account number you used.
432432
433433
```shell
434434
curl -i http://$IP/api/v1/account/1/journal

‎cloudbank-v4/checks/pom.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,17 @@
2626
<dependency>
2727
<groupId>com.oracle.database.spring</groupId>
2828
<artifactId>oracle-spring-boot-starter-wallet</artifactId>
29-
<type>pom</type>
3029
<version>${oracle-springboot-starter.version}</version>
3130
</dependency>
3231
<dependency>
3332
<groupId>org.springframework.boot</groupId>
34-
<artifactId>spring-boot-starter-jdbc</artifactId>
33+
<artifactId>spring-boot-starter-data-jdbc</artifactId>
3534
</dependency>
35+
<dependency>
36+
<groupId>com.oracle.database.spring</groupId>
37+
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
38+
<version>${oracle-springboot-starter.version}</version>
39+
</dependency>
3640
</dependencies>
3741

3842
<build>

‎cloudbank-v4/checks/src/main/java/com/example/checks/ChecksApplication.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
package com.example.checks;
@@ -8,7 +8,6 @@
88
import org.springframework.boot.autoconfigure.SpringBootApplication;
99
import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer;
1010
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
11-
// import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
1211
import org.springframework.cloud.openfeign.EnableFeignClients;
1312
import org.springframework.context.annotation.Bean;
1413
import org.springframework.jms.annotation.EnableJms;
@@ -31,9 +30,10 @@ public static void main(String[] args) {
3130

3231
/**
3332
* Serialize message content to json using TextMessage.
33+
*
3434
* @return TO-DO
3535
*/
36-
@Bean
36+
@Bean
3737
public MessageConverter jacksonJmsMessageConverter() {
3838
MappingJackson2MessageConverter converter = new MappingJackson2MessageConverter();
3939
converter.setTargetType(MessageType.TEXT);
@@ -43,6 +43,7 @@ public MessageConverter jacksonJmsMessageConverter() {
4343

4444
/**
4545
* TO-DO.
46+
*
4647
* @param connectionFactory TO-DO
4748
* @return TO-DO
4849
*/
@@ -56,15 +57,17 @@ public JmsTemplate jmsTemplate(ConnectionFactory connectionFactory) {
5657

5758
/**
5859
* TO-DO.
60+
*
5961
* @param connectionFactory TO-DO
60-
* @param configurer TO-DO
62+
* @param configurer TO-DO
6163
* @return TO-DO
6264
*/
6365
@Bean
6466
public JmsListenerContainerFactory<?> factory(ConnectionFactory connectionFactory,
65-
DefaultJmsListenerContainerFactoryConfigurer configurer) {
67+
DefaultJmsListenerContainerFactoryConfigurer configurer) {
6668
DefaultJmsListenerContainerFactory factory = new DefaultJmsListenerContainerFactory();
67-
// This provides all boot's default to this factory, including the message converter
69+
// This provides all boot's default to this factory, including the message
70+
// converter
6871
configurer.configure(factory, connectionFactory);
6972
// You could still override some of Boot's default if necessary.
7073
return factory;

‎cloudbank-v4/checks/src/main/java/com/example/checks/clients/AccountClient.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
package com.example.checks.clients;
@@ -8,7 +8,6 @@
88
import org.springframework.web.bind.annotation.PostMapping;
99
import org.springframework.web.bind.annotation.RequestBody;
1010

11-
// @FeignClient("accounts")
1211
@FeignClient("account")
1312
public interface AccountClient {
1413

‎cloudbank-v4/checks/src/main/resources/application.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring:
@@ -11,6 +11,13 @@ spring:
1111
url: ${spring.datasource.url}
1212
username: ${spring.datasource.username}
1313
password: ${spring.datasource.password}
14+
type: oracle.ucp.jdbc.PoolDataSource
15+
oracleucp:
16+
connection-factory-class-name: oracle.jdbc.pool.OracleDataSource
17+
connection-pool-name: ChecksConnectionPool
18+
initial-pool-size: 15
19+
min-pool-size: 10
20+
max-pool-size: 30
1421

1522
eureka:
1623
instance:

‎cloudbank-v4/pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Copyright (c) 2023, Oracle and/or its affiliates. -->
2+
<!-- Copyright (c) 2023, 2024, Oracle and/or its affiliates. -->
33
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
44
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -37,12 +37,12 @@
3737
<spring-cloud.version>2023.0.4</spring-cloud.version>
3838
<org.springdoc-version>2.4.0</org.springdoc-version>
3939

40-
<micrometer-core.version>1.13.2</micrometer-core.version>
41-
<lombok.version>1.18.34</lombok.version>
42-
<oracle-springboot-starter.version>23.4.0</oracle-springboot-starter.version>
43-
<oracle-microtx-starter.version>24.2.1</oracle-microtx-starter.version>
44-
<liquibase.version>4.29.1</liquibase.version>
45-
<datasource-micrometer-spring-boot.version>1.0.5</datasource-micrometer-spring-boot.version>
40+
<micrometer-core.version>1.14.1</micrometer-core.version>
41+
<lombok.version>1.18.36</lombok.version>
42+
<oracle-springboot-starter.version>24.4.0</oracle-springboot-starter.version>
43+
<oracle-microtx-starter.version>24.2.2</oracle-microtx-starter.version>
44+
<liquibase.version>4.30.0</liquibase.version>
45+
<datasource-micrometer-spring-boot.version>1.0.6</datasource-micrometer-spring-boot.version>
4646

4747
<!-- Code quality tools -->
4848
<maven-checkstyle-plugin-version>3.3.1</maven-checkstyle-plugin-version>

‎cloudbank-v4/testrunner/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
<dependency>
2929
<groupId>com.oracle.database.spring</groupId>
3030
<artifactId>oracle-spring-boot-starter-wallet</artifactId>
31-
<type>pom</type>
31+
<version>${oracle-springboot-starter.version}</version>
32+
</dependency>
33+
<dependency>
34+
<groupId>com.oracle.database.spring</groupId>
35+
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
3236
<version>${oracle-springboot-starter.version}</version>
3337
</dependency>
3438
</dependencies>

‎cloudbank-v4/testrunner/src/main/java/com/example/testrunner/TestrunnerApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
package com.example.testrunner;

‎cloudbank-v4/testrunner/src/main/resources/application.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2023, Oracle and/or its affiliates.
1+
# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring:
@@ -11,6 +11,13 @@ spring:
1111
url: ${spring.datasource.url}
1212
username: ${spring.datasource.username}
1313
password: ${spring.datasource.password}
14+
type: oracle.ucp.jdbc.PoolDataSource
15+
oracleucp:
16+
connection-factory-class-name: oracle.jdbc.pool.OracleDataSource
17+
connection-pool-name: TestrunnerConnectionPool
18+
initial-pool-size: 15
19+
min-pool-size: 10
20+
max-pool-size: 30
1421

1522
eureka:
1623
instance:

0 commit comments

Comments
 (0)