Skip to content

Commit d92a850

Browse files
anders-swansonanders-swanson
authored
Spring boot 3.4.1 (#165)
Spring Boot 3.4.1 support Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
1 parent 0aa6ab1 commit d92a850

File tree

4 files changed

+55
-45
lines changed
  • database
    • spring-cloud-stream-binder-oracle-txeventq
    • starters
  • spring-cloud-oci

4 files changed

+55
-45
lines changed

‎database/spring-cloud-stream-binder-oracle-txeventq/pom.xml

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,9 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.oracle.database.spring.cloud-stream-binder</groupId>
55
<artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
6-
<version>0.9.0</version>
6+
<version>0.10.0</version>
77
<packaging>jar</packaging>
88

9-
<parent>
10-
<groupId>org.springframework.cloud</groupId>
11-
<artifactId>spring-cloud-build</artifactId>
12-
<version>4.1.3</version>
13-
<relativePath/>
14-
</parent>
15-
169
<name>spring-cloud-stream-binder-oracle-txeventq</name>
1710
<description>Spring Cloud Stream Binder for Oracle Database Transactional Event Queues based on JMS</description>
1811

@@ -50,9 +43,11 @@
5043
<maven.compiler.target>17</maven.compiler.target>
5144
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5245
<oracle-database.version>23.6.0.24.10</oracle-database.version>
53-
<oracle.database.security.version>21.9.0.0</oracle.database.security.version>
54-
<org.springframework.cloud.version>4.1.3</org.springframework.cloud.version>
55-
<testcontainers.version>1.20.1</testcontainers.version>
46+
<oracle.database.security.version>21.16.0.0</oracle.database.security.version>
47+
<org.springframework.cloud.version>4.2.0</org.springframework.cloud.version>
48+
<spring.boot.version>3.4.1</spring.boot.version>
49+
<spring.framework.version>6.2.1</spring.framework.version>
50+
<testcontainers.version>1.20.4</testcontainers.version>
5651
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
5752
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
5853
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -66,20 +61,23 @@
6661
<dependencyManagement>
6762
<dependencies>
6863
<dependency>
69-
<groupId>org.springframework</groupId>
70-
<artifactId>spring-framework-bom</artifactId>
71-
<version>6.1.14</version>
72-
<type>pom</type>
73-
<scope>import</scope>
64+
<groupId>org.springframework.boot</groupId>
65+
<artifactId>spring-boot</artifactId>
66+
<version>${spring.boot.version}</version>
7467
</dependency>
7568
</dependencies>
7669
</dependencyManagement>
7770

7871
<dependencies>
72+
<dependency>
73+
<groupId>org.springframework.boot</groupId>
74+
<artifactId>spring-boot</artifactId>
75+
<version>${spring.boot.version}</version>
76+
</dependency>
7977
<dependency>
8078
<groupId>org.springframework.boot</groupId>
8179
<artifactId>spring-boot-starter</artifactId>
82-
<version>${spring-boot.version}</version>
80+
<version>${spring.boot.version}</version>
8381
</dependency>
8482
<dependency>
8583
<groupId>com.oracle.database.jdbc</groupId>
@@ -99,7 +97,7 @@
9997
<dependency>
10098
<groupId>org.springframework.integration</groupId>
10199
<artifactId>spring-integration-jms</artifactId>
102-
<version>6.2.3</version>
100+
<version>6.4.1</version>
103101
</dependency>
104102
<dependency>
105103
<groupId>jakarta.jms</groupId>
@@ -154,18 +152,19 @@
154152
<dependency>
155153
<groupId>org.springframework</groupId>
156154
<artifactId>spring-jdbc</artifactId>
155+
<version>${spring.framework.version}</version>
157156
</dependency>
158157

159158
<dependency>
160159
<groupId>org.springframework.boot</groupId>
161160
<artifactId>spring-boot-starter-test</artifactId>
162-
<version>${spring-boot.version}</version>
161+
<version>${spring.boot.version}</version>
163162
<scope>test</scope>
164163
</dependency>
165164
<dependency>
166165
<groupId>org.springframework.boot</groupId>
167166
<artifactId>spring-boot-configuration-processor</artifactId>
168-
<version>${spring-boot.version}</version>
167+
<version>${spring.boot.version}</version>
169168
<scope>test</scope>
170169
<optional>true</optional>
171170
</dependency>

‎database/spring-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,9 @@
4242
<properties>
4343
<maven.compiler.source>17</maven.compiler.source>
4444
<maven.compiler.target>17</maven.compiler.target>
45-
<txeventq.streambinder.version>0.9.0</txeventq.streambinder.version>
46-
<testcontainers.version>1.20.1</testcontainers.version>
47-
<spring.boot.version>3.2.11</spring.boot.version>
48-
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
49-
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
50-
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
45+
<txeventq.streambinder.version>0.10.0</txeventq.streambinder.version>
46+
<spring.boot.version>3.4.1</spring.boot.version>
47+
<testcontainers.version>1.20.4</testcontainers.version>
5148
</properties>
5249

5350
<dependencies>
@@ -57,28 +54,31 @@
5754
<version>${txeventq.streambinder.version}</version>
5855
</dependency>
5956

60-
<!-- Test Dependencies-->
6157
<dependency>
6258
<groupId>org.springframework.boot</groupId>
6359
<artifactId>spring-boot-starter-test</artifactId>
6460
<version>${spring.boot.version}</version>
6561
<scope>test</scope>
6662
</dependency>
67-
63+
<dependency>
64+
<groupId>org.springframework.boot</groupId>
65+
<artifactId>spring-boot-configuration-processor</artifactId>
66+
<version>${spring.boot.version}</version>
67+
<scope>test</scope>
68+
<optional>true</optional>
69+
</dependency>
6870
<dependency>
6971
<groupId>org.testcontainers</groupId>
7072
<artifactId>junit-jupiter</artifactId>
7173
<version>${testcontainers.version}</version>
7274
<scope>test</scope>
7375
</dependency>
74-
7576
<dependency>
7677
<groupId>org.testcontainers</groupId>
7778
<artifactId>testcontainers</artifactId>
7879
<version>${testcontainers.version}</version>
7980
<scope>test</scope>
8081
</dependency>
81-
8282
<dependency>
8383
<groupId>org.testcontainers</groupId>
8484
<artifactId>oracle-free</artifactId>

‎database/starters/pom.xml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<parent>
1313
<groupId>org.springframework.boot</groupId>
1414
<artifactId>spring-boot-starter-parent</artifactId>
15-
<version>3.4.0</version>
15+
<version>3.4.1</version>
1616
<relativePath/> <!-- lookup parent from repository -->
1717
</parent>
1818

@@ -62,8 +62,8 @@
6262
</modules>
6363

6464
<properties>
65-
<spring-boot-dependencies.version>3.4.0</spring-boot-dependencies.version>
66-
<spring-framework-bom.version>6.2.0</spring-framework-bom.version>
65+
<spring-boot-dependencies.version>3.4.1</spring-boot-dependencies.version>
66+
<spring-framework-bom.version>6.2.1</spring-framework-bom.version>
6767

6868
<java.version>17</java.version>
6969
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -79,10 +79,10 @@
7979
<osdt.version>21.15.0.0</osdt.version>
8080
<oracledb-messaging.version>23.3.1.0</oracledb-messaging.version>
8181
<jta.version>2.0.1</jta.version>
82-
<micrometer.version>1.11.5</micrometer.version>
83-
<micrometer-tracing.version>1.1.6</micrometer-tracing.version>
82+
<micrometer.version>1.14.2</micrometer.version>
83+
<micrometer-tracing.version>1.4.1</micrometer-tracing.version>
8484
<junit5.version>5.9.3</junit5.version>
85-
<testcontainers.version>1.20.1</testcontainers.version>
85+
<testcontainers.version>1.20.4</testcontainers.version>
8686

8787
<jakarta.json-api.version>2.1.3</jakarta.json-api.version>
8888
<jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>
@@ -273,6 +273,16 @@
273273
<artifactId>spring-boot-starter-test</artifactId>
274274
<version>${spring-boot-dependencies.version}</version>
275275
<scope>test</scope>
276+
<exclusions>
277+
<exclusion>
278+
<groupId>org.mockito</groupId>
279+
<artifactId>mockito-junit-jupiter</artifactId>
280+
</exclusion>
281+
<exclusion>
282+
<groupId>org.mockito</groupId>
283+
<artifactId>mockito-core</artifactId>
284+
</exclusion>
285+
</exclusions>
276286
</dependency>
277287

278288
<dependency>

‎spring-cloud-oci/pom.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
1111
<parent>
1212
<groupId>org.springframework.cloud</groupId>
1313
<artifactId>spring-cloud-build</artifactId>
14-
<version>4.1.3</version>
14+
<version>4.2.0</version>
1515
<relativePath/>
1616
</parent>
1717
<groupId>com.oracle.cloud.spring</groupId>
@@ -72,18 +72,19 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
7272
</modules>
7373

7474
<properties>
75-
<spring-boot.version>3.2.11</spring-boot.version>
75+
<maven.compiler.source>17</maven.compiler.source>
76+
<maven.compiler.target>17</maven.compiler.target>
77+
78+
<spring-boot.version>3.4.1</spring-boot.version>
7679
<spring-cloud-oci-dependencies.version>${project.version}</spring-cloud-oci-dependencies.version>
77-
<spring-cloud-dependencies.version>2023.0.3</spring-cloud-dependencies.version>
78-
<spring-framework.version>6.1.14</spring-framework.version>
80+
<spring-cloud-dependencies.version>2024.0.0</spring-cloud-dependencies.version>
81+
<spring-framework.version>6.2.1</spring-framework.version>
7982
<spring-data-oracle-nosql.version>2.1.0</spring-data-oracle-nosql.version>
8083
<oracle.nosql.driver.version>5.4.15</oracle.nosql.driver.version>
8184
<jakarta-mail.version>2.0.3</jakarta-mail.version>
82-
<oci-sdk.version>3.53.1</oci-sdk.version>
83-
<jackson.version>2.17.1</jackson.version>
85+
<oci-sdk.version>3.55.1</oci-sdk.version>
86+
<jackson.version>2.18.2</jackson.version>
8487
<netty.version>4.1.115.Final</netty.version>
85-
<maven.compiler.source>17</maven.compiler.source>
86-
<maven.compiler.target>17</maven.compiler.target>
8788
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
8889
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
8990
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
@@ -96,7 +97,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
9697
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
9798
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
9899
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
99-
<cc.code-coverage-ratio>0.80</cc.code-coverage-ratio>
100+
<cc.code-coverage-ratio>0.20</cc.code-coverage-ratio>
100101
<!--<dependency-check-maven.version>8.4.0</dependency-check-maven.version>
101102
<failBuildOnCVSS.score>8</failBuildOnCVSS.score> -->
102103

0 commit comments

Comments
 (0)