Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spring boot 3.4.1 #165

Merged
merged 3 commits into from
Jan 10, 2025
Merged

Spring boot 3.4.1 #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e518d7
Database, Binder updates
anders-swanson Jan 10, 2025
cae710d
Spring Boot 3.4.1 Spring Cloud OCI
anders-swanson Jan 10, 2025
e9cb502
Micrometer update
anders-swanson Jan 10, 2025
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
39 changes: 19 additions & 20 deletions database/spring-cloud-stream-binder-oracle-txeventq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.database.spring.cloud-stream-binder</groupId>
<artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
<version>0.9.0</version>
<version>0.10.0</version>
<packaging>jar</packaging>

<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.3</version>
<relativePath/>
</parent>

<name>spring-cloud-stream-binder-oracle-txeventq</name>
<description>Spring Cloud Stream Binder for Oracle Database Transactional Event Queues based on JMS</description>

Expand Down Expand Up @@ -50,9 +43,11 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<oracle-database.version>23.6.0.24.10</oracle-database.version>
<oracle.database.security.version>21.9.0.0</oracle.database.security.version>
<org.springframework.cloud.version>4.1.3</org.springframework.cloud.version>
<testcontainers.version>1.20.1</testcontainers.version>
<oracle.database.security.version>21.16.0.0</oracle.database.security.version>
<org.springframework.cloud.version>4.2.0</org.springframework.cloud.version>
<spring.boot.version>3.4.1</spring.boot.version>
<spring.framework.version>6.2.1</spring.framework.version>
<testcontainers.version>1.20.4</testcontainers.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
Expand All @@ -66,20 +61,23 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>6.1.14</version>
<type>pom</type>
<scope>import</scope>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>${spring.boot.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot</artifactId>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<version>${spring-boot.version}</version>
<version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
Expand All @@ -99,7 +97,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jms</artifactId>
<version>6.2.3</version>
<version>6.4.1</version>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
Expand Down Expand Up @@ -154,18 +152,19 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<version>${spring.framework.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring-boot.version}</version>
<version>${spring.boot.version}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
Expand Down
20 changes: 10 additions & 10 deletions ...ng-cloud-stream-binder-oracle-txeventq/spring-cloud-stream-binder-txeventq-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,9 @@
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<txeventq.streambinder.version>0.9.0</txeventq.streambinder.version>
<testcontainers.version>1.20.1</testcontainers.version>
<spring.boot.version>3.2.11</spring.boot.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<txeventq.streambinder.version>0.10.0</txeventq.streambinder.version>
<spring.boot.version>3.4.1</spring.boot.version>
<testcontainers.version>1.20.4</testcontainers.version>
</properties>

<dependencies>
Expand All @@ -57,28 +54,31 @@
<version>${txeventq.streambinder.version}</version>
</dependency>

<!-- Test Dependencies-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring.boot.version}</version>
<scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>oracle-free</artifactId>
Expand Down
22 changes: 16 additions & 6 deletions database/starters/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.0</version>
<version>3.4.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down Expand Up @@ -62,8 +62,8 @@
</modules>

<properties>
<spring-boot-dependencies.version>3.4.0</spring-boot-dependencies.version>
<spring-framework-bom.version>6.2.0</spring-framework-bom.version>
<spring-boot-dependencies.version>3.4.1</spring-boot-dependencies.version>
<spring-framework-bom.version>6.2.1</spring-framework-bom.version>

<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand All @@ -79,10 +79,10 @@
<osdt.version>21.15.0.0</osdt.version>
<oracledb-messaging.version>23.3.1.0</oracledb-messaging.version>
<jta.version>2.0.1</jta.version>
<micrometer.version>1.11.5</micrometer.version>
<micrometer-tracing.version>1.1.6</micrometer-tracing.version>
<micrometer.version>1.14.2</micrometer.version>
<micrometer-tracing.version>1.4.1</micrometer-tracing.version>
<junit5.version>5.9.3</junit5.version>
<testcontainers.version>1.20.1</testcontainers.version>
<testcontainers.version>1.20.4</testcontainers.version>

<jakarta.json-api.version>2.1.3</jakarta.json-api.version>
<jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>
Expand Down Expand Up @@ -273,6 +273,16 @@
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot-dependencies.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
</exclusion>
<exclusion>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
19 changes: 10 additions & 9 deletions spring-cloud-oci/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
<relativePath/>
</parent>
<groupId>com.oracle.cloud.spring</groupId>
Expand Down Expand Up @@ -72,18 +72,19 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
</modules>

<properties>
<spring-boot.version>3.2.11</spring-boot.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<spring-boot.version>3.4.1</spring-boot.version>
<spring-cloud-oci-dependencies.version>${project.version}</spring-cloud-oci-dependencies.version>
<spring-cloud-dependencies.version>2023.0.3</spring-cloud-dependencies.version>
<spring-framework.version>6.1.14</spring-framework.version>
<spring-cloud-dependencies.version>2024.0.0</spring-cloud-dependencies.version>
<spring-framework.version>6.2.1</spring-framework.version>
<spring-data-oracle-nosql.version>2.1.0</spring-data-oracle-nosql.version>
<oracle.nosql.driver.version>5.4.15</oracle.nosql.driver.version>
<jakarta-mail.version>2.0.3</jakarta-mail.version>
<oci-sdk.version>3.53.1</oci-sdk.version>
<jackson.version>2.17.1</jackson.version>
<oci-sdk.version>3.55.1</oci-sdk.version>
<jackson.version>2.18.2</jackson.version>
<netty.version>4.1.115.Final</netty.version>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
<maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
Expand All @@ -96,7 +97,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
<checksum-maven-plugin.version>1.11</checksum-maven-plugin.version>
<jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<cc.code-coverage-ratio>0.80</cc.code-coverage-ratio>
<cc.code-coverage-ratio>0.20</cc.code-coverage-ratio>
<!--<dependency-check-maven.version>8.4.0</dependency-check-maven.version>
<failBuildOnCVSS.score>8</failBuildOnCVSS.score> -->

Expand Down
Loading