Skip to content

Commit 3aae981

Browse files
Merge branch 'master' of https://github.com/igorcampos-dev/spring-integrations-examples into feature/spring-databases-example
# Conflicts: # spring-oracle-example/pom.xml
2 parents d85addb + d5ee3a9 commit 3aae981

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Below you will find a summary table of each subproject. For more details, please
1717
| Name | Description |
1818
|---------------------------------------------------------------------------|-----------------------------------------------------------------------------------|
1919
| [Spring Boot + Jasper](./spring-jasper-example) | Demonstrates a basic integration between Spring Boot and Jasper. |
20+
| [Spring Boot Multi Module](./spring-multimodule-example) | Basic demonstration of multi-module configuration in Spring Boot |
2021
| [Spring Boot + Kafka](./spring-kafka-example) | Demonstrates a basic integration between Spring Boot and Apache Kafka. |
2122
| [Spring Boot + Keycloak](./spring-keycloak-example) | Demonstrates a basic integration between Spring Boot and Keycloak. |
2223
| [Spring Boot + Oracle](./spring-oracle-example) | Demonstrates a basic integration between Spring Boot and Oracle. |

spring-multimodule-example/module-b-example/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<properties>
1717
<java.version>21</java.version>
18-
<spring.boot.version>3.5.6</spring.boot.version>
18+
<spring.boot.version>3.5.7</spring.boot.version>
1919
</properties>
2020

2121
<dependencies>

spring-multimodule-example/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.5.6</version>
9+
<version>3.5.7</version>
1010
<relativePath/>
1111
</parent>
1212

@@ -17,7 +17,7 @@
1717

1818
<properties>
1919
<java.version>21</java.version>
20-
<spring.boot.version>3.5.6</spring.boot.version>
20+
<spring.boot.version>3.5.7</spring.boot.version>
2121
</properties>
2222

2323
<modules>

spring-oracle-example/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
<properties>
2020
<java.version>21</java.version>
2121
<spring.boot.version>3.5.7</spring.boot.version>
22+
<lombok.version>1.18.42</lombok.version>
23+
<oracle.database.version>23.26.0.0.0</oracle.database.version>
2224
<maven.compiler.plugin.version>3.14.1</maven.compiler.plugin.version>
23-
<oracle.database.version>23.9.0.25.07</oracle.database.version>
2425
<h2database.version>2.4.240</h2database.version>
2526
</properties>
2627

spring-prometheus-grafana-example/compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313

1414
prometheus:
1515
container_name: prometheus
16-
image: prom/prometheus:v3.7.2
16+
image: prom/prometheus:v3.7.3
1717
ports:
1818
- "9090:9090"
1919
volumes:

0 commit comments

Comments
 (0)