This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fd32418fdf36 CAMEL-23481: Replace retired Apache Derby with H2 in
camel-spring-xml tests
fd32418fdf36 is described below
commit fd32418fdf36c7dbfcbbc0c05d33a0633e7fc85b
Author: Torsten Mielke <[email protected]>
AuthorDate: Mon Jun 8 11:53:52 2026 +0200
CAMEL-23481: Replace retired Apache Derby with H2 in camel-spring-xml tests
Migrate test database from Derby to H2 since Apache Derby is a retired
project. Updates test dependency and 7 Spring XML configurations.
Closes #23845
---
components/camel-spring-parent/camel-spring-xml/pom.xml | 12 +++---------
.../spring/interceptor/MixedTransactionPropagationTest.xml | 5 +++--
.../spring/interceptor/mixedPropagationTransactedTest.xml | 4 ++--
...ringTransactionalClientDataSourceMinimalConfiguration.xml | 4 ++--
.../spring/interceptor/transactionalClientDataSource.xml | 4 ++--
.../interceptor/transactionalClientWithAnnotatedBeanTest.xml | 4 ++--
...ctionErrorHandlerAndContextScopedOnExceptionIssueTest.xml | 4 ++--
.../spring/xml/handler/ErrorHandlerDefinitionParser.xml | 2 +-
8 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/components/camel-spring-parent/camel-spring-xml/pom.xml
b/components/camel-spring-parent/camel-spring-xml/pom.xml
index 7103ebc168cc..517e1439ef2e 100644
--- a/components/camel-spring-parent/camel-spring-xml/pom.xml
+++ b/components/camel-spring-parent/camel-spring-xml/pom.xml
@@ -132,17 +132,11 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby-version}</version>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby-version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
index 1c67f139ed25..1fab1774221a 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/MixedTransactionPropagationTest.xml
@@ -25,8 +25,8 @@
http://www.springframework.org/schema/jdbc
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <jdbc:embedded-database id="dataSource" type="DERBY">
- <jdbc:script location="classpath:sql/init.sql" />
+ <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
<bean id="txManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
@@ -50,3 +50,4 @@
</bean>
</beans>
+
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
index 5d62bb33e386..4df2364c782e 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/mixedPropagationTransactedTest.xml
@@ -25,8 +25,8 @@
http://www.springframework.org/schema/jdbc
http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
- <jdbc:embedded-database id="dataSource" type="DERBY">
- <jdbc:script location="classpath:sql/init.sql" />
+ <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
<bean id="txManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
index 6c5797f4d697..f6d235089a11 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/springTransactionalClientDataSourceMinimalConfiguration.xml
@@ -27,8 +27,8 @@
<!-- START SNIPPET: e1 -->
<!-- this example uses JDBC so we define a data source -->
- <jdbc:embedded-database id="dataSource" type="DERBY">
- <jdbc:script location="classpath:sql/init.sql" />
+ <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
<!-- spring transaction manager -->
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
index dc27ddedf47a..06d4b194e880 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientDataSource.xml
@@ -27,8 +27,8 @@
<!-- START SNIPPET: e1 -->
<!-- datasource to the database -->
- <jdbc:embedded-database id="dataSource" type="DERBY">
- <jdbc:script location="classpath:sql/init.sql" />
+ <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
<!-- spring transaction manager -->
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
index 08c4e1506c21..adab12719825 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/interceptor/transactionalClientWithAnnotatedBeanTest.xml
@@ -33,8 +33,8 @@
<tx:annotation-driven transaction-manager="txManager"/>
<!-- datasource to the database -->
- <jdbc:embedded-database id="dataSource" type="DERBY">
- <jdbc:script location="classpath:sql/init.sql" />
+ <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
<!-- spring transaction manager -->
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
index a187136f9ff8..bd9603586c3e 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/issues/SpringTransactionErrorHandlerAndContextScopedOnExceptionIssueTest.xml
@@ -27,8 +27,8 @@
">
<!-- the data source -->
- <jdbc:embedded-database id="dataSource" type="DERBY">
- <jdbc:script location="classpath:sql/init.sql" />
+ <jdbc:embedded-database id="dataSource" type="H2">
+ <jdbc:script location="classpath:sql/init.sql"/>
</jdbc:embedded-database>
<!-- spring transaction manager -->
diff --git
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
index 226b8733d650..9ee55d1b4f47 100644
---
a/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
+++
b/components/camel-spring-parent/camel-spring-xml/src/test/resources/org/apache/camel/spring/xml/handler/ErrorHandlerDefinitionParser.xml
@@ -55,7 +55,7 @@
</camelContext>
<!-- END SNIPPET: example -->
- <jdbc:embedded-database id="dataSource" type="DERBY" />
+ <jdbc:embedded-database id="dataSource" type="H2"/>
<!-- spring transaction manager -->
<bean id="txManager"
class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
