Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 19 additions & 8 deletions database/spring-cloud-stream-binder-oracle-txeventq/pom.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<!-- Copyright (c) 2024, 2026, Oracle and/or its affiliates. -->
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.database.spring.cloud-stream-binder</groupId>
<artifactId>spring-cloud-stream-binder-oracle-txeventq</artifactId>
<version>0.17.0</version>
<version>0.18.0</version>
<packaging>jar</packaging>

<name>spring-cloud-stream-binder-oracle-txeventq</name>
Expand Down Expand Up @@ -46,9 +48,10 @@
<oracle-database.version>23.26.1.0.0</oracle-database.version>
<oracle.database.security.version>21.20.0.0</oracle.database.security.version>
<org.springframework.cloud.version>5.0.1</org.springframework.cloud.version>
<spring.boot.version>4.0.3</spring.boot.version>
<spring.framework.version>7.0.5</spring.framework.version>
<testcontainers.version>1.21.4</testcontainers.version>
<spring.boot.version>4.0.5</spring.boot.version>
<spring.framework.version>7.0.6</spring.framework.version>
<testcontainers.version>2.0.4</testcontainers.version>
<jackson.annotations.version>2.21</jackson.annotations.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 Down Expand Up @@ -102,7 +105,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-jms</artifactId>
<version>7.0.2</version>
<version>7.0.4</version>
</dependency>
<dependency>
<groupId>jakarta.jms</groupId>
Expand All @@ -114,6 +117,11 @@
<artifactId>commons-codec</artifactId>
<version>1.21.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.annotations.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down Expand Up @@ -185,21 +193,24 @@
<version>${org.springframework.cloud.version}</version>
<scope>test</scope>
</dependency>
<!-- Test Dependencies-->
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-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>
<artifactId>testcontainers-oracle-free</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
Expand Down Expand Up @@ -323,4 +334,4 @@
<url>${repository.url}</url>
</snapshotRepository>
</distributionManagement>
</project>
</project>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- Copyright (c) 2024, 2025, Oracle and/or its affiliates. -->
<!-- Copyright (c) 2024, 2026, Oracle and/or its affiliates. -->
<!-- Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl. -->
<modelVersion>4.0.0</modelVersion>
<groupId>com.oracle.database.spring.cloud-stream-binder</groupId>
Expand Down Expand Up @@ -42,9 +42,10 @@
<properties>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<txeventq.streambinder.version>0.17.0</txeventq.streambinder.version>
<spring.boot.version>4.0.3</spring.boot.version>
<testcontainers.version>1.21.4</testcontainers.version>
<txeventq.streambinder.version>0.18.0</txeventq.streambinder.version>
<spring.boot.version>4.0.5</spring.boot.version>
<testcontainers.version>2.0.4</testcontainers.version>
<jackson.annotations.version>2.21</jackson.annotations.version>
</properties>

<dependencies>
Expand All @@ -70,27 +71,32 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
<version>7.0.5</version> <!-- Matches your spring-core version -->
<version>7.0.6</version> <!-- Matches your spring-core version -->
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oracle.database.spring</groupId>
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
<version>26.0.1</version>
</dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>4.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.oracle.database.spring</groupId>
<artifactId>oracle-spring-boot-starter-aqjms</artifactId>
<version>26.0.0</version>
</dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jackson.annotations.version}</version>
</dependency>
<dependency>
<groupId>com.oracle.database.spring</groupId>
<artifactId>oracle-spring-boot-starter-ucp</artifactId>
<version>26.1.0</version>
</dependency>
<dependency>
<groupId>com.oracle.database.spring</groupId>
<artifactId>oracle-spring-boot-starter-aqjms</artifactId>
<version>26.1.0</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
<artifactId>testcontainers-junit-jupiter</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
Expand All @@ -102,7 +108,7 @@
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>oracle-free</artifactId>
<artifactId>testcontainers-oracle-free</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
@Testcontainers
public class TxEventQSampleAppTest {
@Container
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.0-slim-faststart")
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.1-slim-faststart")
.withStartupTimeout(Duration.ofMinutes(2))
.withUsername("testuser")
.withPassword("testpwd");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@


@SuppressWarnings("unchecked")
@Testcontainers
@Testcontainers(disabledWithoutDocker = true)
public class TEQPartitionIT extends
PartitionCapableBinderTests<TxEventQTestBinder, ExtendedConsumerProperties<JmsConsumerProperties>, ExtendedProducerProperties<JmsProducerProperties>> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.oracle.OracleContainer;

@Testcontainers
@Testcontainers(disabledWithoutDocker = true)
@SpringBootTest(classes = TxEventQJmsConfiguration.class)
@Import(TEQSpringBootIT.Config.class)
public class TEQSpringBootIT {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
public class Util {
@SuppressWarnings("resource")
public static OracleContainer oracleContainer() {
return new OracleContainer("gvenzl/oracle-free:23.26.0-slim-faststart")
return new OracleContainer("gvenzl/oracle-free:23.26.1-slim-faststart")
.withStartupTimeout(Duration.ofMinutes(2)) // Needed for M1 Mac
.withUsername("testuser")
.withPassword("testpwd");
Expand Down
4 changes: 2 additions & 2 deletions database/starters/oracle-spring-boot-json-data-tools/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starters</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-json-data-tools</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot - JSON Data Tools</name>
<description>Spring Boot for Oracle Database JSON Data Tools</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
@SpringBootTest(classes = JsonCollectionsAutoConfiguration.class)
@Testcontainers
public class JsonCollectionsIT {
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.0-slim-faststart")
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.1-slim-faststart")
.withStartupTimeout(Duration.ofMinutes(2))
.withUsername("testuser")
.withPassword("testpwd");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starters</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-json-relational-duality-views</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot - JSON Relational Duality Views</name>
<description>Spring Boot for Oracle Database JSON Relational duality Views</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static String readViewFile(String fileName) {
*/
@Container
@ServiceConnection
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.0-slim-faststart")
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.1-slim-faststart")
.withStartupTimeout(Duration.ofMinutes(5))
.withInitScript("products.sql")
.withUsername("testuser")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starters</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-spatial-data-tools</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot - Spatial Data Tools</name>
<description>Spring Boot for Oracle Database Spatial Data Tools</description>
Expand Down
4 changes: 2 additions & 2 deletions database/starters/oracle-spring-boot-starter-aqjms/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starters</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-starter-aqjms</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>
<packaging>jar</packaging>

<!-- Project Information -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starters</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-starter-json-collections</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot Starter - JSON Collections</name>
<description>Spring Boot Starter for Oracle Database JSON collections</description>
Expand Down
4 changes: 2 additions & 2 deletions database/starters/oracle-spring-boot-starter-okafka/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starters</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-starter-okafka</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot Starter - Kafka Java Client for Oracle Database Transactional Event Queues</name>
<description>Spring Boot Starter for the Kafka Java Client for Oracle Database Transactional Event Queues</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starter-samples</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-sample-json-duality</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot Starter - JSON Relational Duality Views Sample</name>
<description>Oracle Spring Boot Starter Sample for JSON Relational Duality Views</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class JSONDualitySampleApplicationTest {
* The Testcontainers Oracle Free module let's us create an Oracle database container in a junit context.
*/
@Container
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.0-slim-faststart")
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.1-slim-faststart")
.withStartupTimeout(Duration.ofMinutes(2))
.withUsername("testuser")
.withPassword("testpwd");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starter-samples</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-sample-json-events</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot Starter - JSON Events Sample</name>
<description>Oracle Spring Boot Starter Sample for JSON Events</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class JSONEventsSampleTest {
* The Testcontainers Oracle Free module let's us create an Oracle database container in a junit context.
*/
@Container
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.0-slim-faststart")
static OracleContainer oracleContainer = new OracleContainer("gvenzl/oracle-free:23.26.1-slim-faststart")
.withStartupTimeout(Duration.ofMinutes(2))
.withUsername("testuser")
.withPassword("testpwd");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<artifactId>oracle-spring-boot-starter-samples</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
public class
OKafkaSampleTest {
// Oracle Database 23ai Free container image
private static final String oracleImage = "gvenzl/oracle-free:23.26.0-slim-faststart";
private static final String oracleImage = "gvenzl/oracle-free:23.26.1-slim-faststart";
private static final String testUser = "testuser";
private static final String testPassword = "Welcome123#";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<artifactId>oracle-spring-boot-starter-samples</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<parent>
<artifactId>oracle-spring-boot-starter-samples</artifactId>
<groupId>com.oracle.database.spring</groupId>
<version>26.1.0</version>
<version>26.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>oracle-spring-boot-sample-spatial</artifactId>
<version>26.1.0</version>
<version>26.1.1</version>

<name>Oracle Spring Boot Starter - Spatial Sample</name>
<description>Oracle Spring Boot Starter Sample for Oracle Spatial</description>
Expand Down
Loading
Loading