You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/04/28 08:56:37 UTC
[camel] branch main updated: Lets try H2 database as attempt to fix flaky SQL tests on CI server.
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 8b30178a519 Lets try H2 database as attempt to fix flaky SQL tests on CI server.
8b30178a519 is described below
commit 8b30178a5198e77efd35ebd46200e61e237f2289
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Apr 28 10:55:27 2022 +0200
Lets try H2 database as attempt to fix flaky SQL tests on CI server.
---
components/camel-sql/pom.xml | 13 +++++++------
.../apache/camel/component/sql/CamelSqlEmptyResultTest.java | 2 +-
.../apache/camel/component/sql/SqlAggregateBatchTest.java | 2 +-
.../component/sql/SqlConsumerDeleteBatchCompleteTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteFailedTest.java | 2 +-
.../apache/camel/component/sql/SqlConsumerDeleteTest.java | 2 +-
.../camel/component/sql/SqlConsumerDeleteTransformTest.java | 2 +-
.../component/sql/SqlConsumerDynamicParameterTest.java | 2 +-
.../component/sql/SqlConsumerOutputTypeSelectListTest.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectListWithClassTest.java | 2 +-
.../component/sql/SqlConsumerOutputTypeSelectOneTest.java | 2 +-
.../component/sql/SqlConsumerOutputTypeStreamListTest.java | 2 +-
.../org/apache/camel/component/sql/SqlConsumerTest.java | 2 +-
.../apache/camel/component/sql/SqlDataSourceRefTest.java | 2 +-
.../org/apache/camel/component/sql/SqlDataSourceTest.java | 2 +-
.../org/apache/camel/component/sql/SqlEndpointLikeTest.java | 2 +-
.../sql/SqlEndpointMisconfigureDataSourceTest.java | 2 +-
.../org/apache/camel/component/sql/SqlEndpointTest.java | 2 +-
.../apache/camel/component/sql/SqlPreserveHeaderTest.java | 2 +-
.../sql/SqlProducerAlwaysPopulateStatementFalseTest.java | 2 +-
.../sql/SqlProducerAlwaysPopulateStatementTest.java | 2 +-
.../apache/camel/component/sql/SqlProducerAndInTest.java | 2 +-
.../camel/component/sql/SqlProducerConcurrentTest.java | 2 +-
.../component/sql/SqlProducerExpressionParameterTest.java | 2 +-
.../apache/camel/component/sql/SqlProducerInMultiTest.java | 2 +-
.../org/apache/camel/component/sql/SqlProducerInTest.java | 2 +-
.../camel/component/sql/SqlProducerInsertNullTest.java | 2 +-
.../org/apache/camel/component/sql/SqlProducerJSONTest.java | 2 +-
.../sql/SqlProducerNamedParameterNotExistTest.java | 2 +-
.../camel/component/sql/SqlProducerNamedParameterTest.java | 2 +-
.../camel/component/sql/SqlProducerNamedParametersTest.java | 4 ++--
.../org/apache/camel/component/sql/SqlProducerNoopTest.java | 2 +-
.../camel/component/sql/SqlProducerNullBodyHeaderTest.java | 2 +-
.../apache/camel/component/sql/SqlProducerNullBodyTest.java | 2 +-
.../camel/component/sql/SqlProducerOutputHeaderTest.java | 2 +-
.../component/sql/SqlProducerOutputHeaderWithQueryTest.java | 2 +-
.../component/sql/SqlProducerOutputTypeSelectListTest.java | 2 +-
.../sql/SqlProducerOutputTypeSelectListWithClassTest.java | 2 +-
.../sql/SqlProducerOutputTypeSelectOneNoResultTest.java | 2 +-
.../component/sql/SqlProducerOutputTypeSelectOneTest.java | 2 +-
.../component/sql/SqlProducerOutputTypeStreamListTest.java | 2 +-
.../camel/component/sql/SqlProducerParametersCountTest.java | 2 +-
.../camel/component/sql/SqlProducerReuseParameterTest.java | 2 +-
.../camel/component/sql/SqlProducerSeparatorTest.java | 2 +-
.../org/apache/camel/component/sql/SqlProducerToDTest.java | 2 +-
.../component/sql/SqlProducerUseMessageBodyForSqlTest.java | 2 +-
.../camel/component/sql/SqlProducerWhereIssueTest.java | 6 +++---
.../java/org/apache/camel/component/sql/SqlRouteTest.java | 2 +-
.../apache/camel/component/sql/SqlTransactedRouteTest.java | 2 +-
.../camel/component/sql/SpringSqlEndpointLikeTest.xml | 2 +-
.../apache/camel/component/sql/SpringSqlMultilineTest.xml | 2 +-
.../camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml | 10 +++++-----
.../camel/processor/idempotent/jdbc/cached-spring.xml | 2 +-
.../camel/processor/idempotent/jdbc/customized-spring.xml | 2 +-
.../idempotent/jdbc/customized-tablename-spring.xml | 2 +-
.../org/apache/camel/processor/idempotent/jdbc/spring.xml | 2 +-
56 files changed, 69 insertions(+), 68 deletions(-)
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index ea5174a030f..7e6bd668cb4 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -72,6 +72,12 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <!-- derby used for stored procedure tests -->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -82,15 +88,10 @@
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>2.1.210</version>
+ <version>2.1.212</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java
index a2fd45022ef..3a59afee7bc 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/CamelSqlEmptyResultTest.java
@@ -39,7 +39,7 @@ public class CamelSqlEmptyResultTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java
index 7ca36c01f17..a8bbb524881 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlAggregateBatchTest.java
@@ -67,7 +67,7 @@ public class SqlAggregateBatchTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
index 7ab35335026..f72c57a08fa 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
@@ -42,7 +42,7 @@ public class SqlConsumerDeleteBatchCompleteTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
index c6e418ea5b4..4128203f1c7 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
@@ -47,7 +47,7 @@ public class SqlConsumerDeleteFailedTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
index b4e4ed322bf..16abc043374 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
@@ -46,7 +46,7 @@ public class SqlConsumerDeleteTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
index 4f62ad7b40d..f5d789ad36a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
@@ -42,7 +42,7 @@ public class SqlConsumerDeleteTransformTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
index e7f81424d44..74ba7606c50 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java
@@ -46,7 +46,7 @@ public class SqlConsumerDynamicParameterTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
index 3488671764c..b247d3a80f5 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
@@ -46,7 +46,7 @@ public class SqlConsumerOutputTypeSelectListTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
index 597e5afc2bd..667545856d5 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
@@ -45,7 +45,7 @@ public class SqlConsumerOutputTypeSelectListWithClassTest extends CamelTestSuppo
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
index 34f0a289d7b..65d3421a1c9 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
@@ -45,7 +45,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
public void setUp() {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
camel1 = new DefaultCamelContext();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
index 2abb1982c86..b758626c270 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
@@ -41,7 +41,7 @@ public class SqlConsumerOutputTypeStreamListTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
index 18681dac064..4a0a5a3d54d 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
@@ -45,7 +45,7 @@ public class SqlConsumerTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
index 39560bec06f..7a70ef0d1f8 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceRefTest.java
@@ -45,7 +45,7 @@ public class SqlDataSourceRefTest extends CamelTestSupport {
// this is the database we create with some initial data for our unit test
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
// END SNIPPET: e2
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
index 4317b6ebd7a..d985797d409 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDataSourceTest.java
@@ -44,7 +44,7 @@ public class SqlDataSourceTest extends CamelTestSupport {
// this is the database we create with some initial data for our unit test
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
reg.bind("dataSource", db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
index e93727e553b..c2e84697096 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointLikeTest.java
@@ -47,7 +47,7 @@ public class SqlEndpointLikeTest extends CamelTestSupport {
// this is the database we create with some initial data for our unit test
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
reg.bind("jdbc/myDataSource", db);
return reg;
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java
index 75fc8458f19..130f8e1f0fd 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java
@@ -75,7 +75,7 @@ public class SqlEndpointMisconfigureDataSourceTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
index 5c6872a11d5..8b0824ab30a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlEndpointTest.java
@@ -46,7 +46,7 @@ public class SqlEndpointTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
index eb3dab46bca..1830c3ac8e7 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlPreserveHeaderTest.java
@@ -46,7 +46,7 @@ public class SqlPreserveHeaderTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
index b846deda0b0..3810324393d 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
@@ -50,7 +50,7 @@ public class SqlProducerAlwaysPopulateStatementFalseTest extends CamelTestSuppor
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
strategy = new DefaultSqlPrepareStatementStrategy() {
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
index ec2ed454a9b..e6fdadc08a3 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
@@ -49,7 +49,7 @@ public class SqlProducerAlwaysPopulateStatementTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
strategy = new DefaultSqlPrepareStatementStrategy() {
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
index d9dad678cc2..2f9868d2d58 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
@@ -41,7 +41,7 @@ public class SqlProducerAndInTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
index ac469f9a580..4bd464fe74a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
@@ -94,7 +94,7 @@ public class SqlProducerConcurrentTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java
index c8884d8fa36..2aa25dd1af4 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerExpressionParameterTest.java
@@ -48,7 +48,7 @@ public class SqlProducerExpressionParameterTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql")
.build();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
index d1388733a12..454289bfe5b 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
@@ -42,7 +42,7 @@ public class SqlProducerInMultiTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase6.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
index 3f93fa72000..86ae9f0c158 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
@@ -41,7 +41,7 @@ public class SqlProducerInTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java
index 535d94ce11a..ce2db942438 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInsertNullTest.java
@@ -42,7 +42,7 @@ public class SqlProducerInsertNullTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase2.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java
index bb9360d6d1e..5f832f40253 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerJSONTest.java
@@ -41,7 +41,7 @@ public class SqlProducerJSONTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase2.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java
index 20813aa039f..2d583bc1c15 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterNotExistTest.java
@@ -40,7 +40,7 @@ public class SqlProducerNamedParameterNotExistTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
index 959a7c63245..ab9762c37d6 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParameterTest.java
@@ -42,7 +42,7 @@ public class SqlProducerNamedParameterTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java
index c1343cdfe67..251ec6d457f 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNamedParametersTest.java
@@ -40,8 +40,8 @@ public class SqlProducerNamedParametersTest extends CamelTestSupport {
@Override
@BeforeEach
public void setUp() throws Exception {
- db = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY)
- .setType(EmbeddedDatabaseType.DERBY)
+ db = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
index 3d56141015a..47ed7e8e96d 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNoopTest.java
@@ -35,7 +35,7 @@ public class SqlProducerNoopTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
index 1478cf466db..7fc2c683d02 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyHeaderTest.java
@@ -41,7 +41,7 @@ public class SqlProducerNullBodyHeaderTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
index 86726e676fe..37ee75b257f 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerNullBodyTest.java
@@ -41,7 +41,7 @@ public class SqlProducerNullBodyTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java
index db9d5fa5ffd..4ffb98f04fa 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderTest.java
@@ -35,7 +35,7 @@ public class SqlProducerOutputHeaderTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java
index da35d4ad9ed..3b21f47211d 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputHeaderWithQueryTest.java
@@ -35,7 +35,7 @@ public class SqlProducerOutputHeaderWithQueryTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
index d2c21ac32fe..0137260df83 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
@@ -41,7 +41,7 @@ public class SqlProducerOutputTypeSelectListTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java
index aada827b43b..1ad76b27a98 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListWithClassTest.java
@@ -40,7 +40,7 @@ public class SqlProducerOutputTypeSelectListWithClassTest extends CamelTestSuppo
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java
index 433aa8f79d2..9d2f83544b1 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneNoResultTest.java
@@ -39,7 +39,7 @@ public class SqlProducerOutputTypeSelectOneNoResultTest extends CamelTestSupport
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase5.sql")
.build();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
index 3ca8ce60586..fe3d578f9d1 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
@@ -43,7 +43,7 @@ public class SqlProducerOutputTypeSelectOneTest {
public void setUp() {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
camel1 = new DefaultCamelContext();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java
index e4f69b78178..b38edcae323 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeStreamListTest.java
@@ -41,7 +41,7 @@ public class SqlProducerOutputTypeStreamListTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java
index 4d1e08f50cb..9c9fd90d311 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerParametersCountTest.java
@@ -41,7 +41,7 @@ public class SqlProducerParametersCountTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java
index 0e246b52ca5..d358a0b6c75 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerReuseParameterTest.java
@@ -41,7 +41,7 @@ public class SqlProducerReuseParameterTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java
index 3244d6deee1..128396c1510 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerSeparatorTest.java
@@ -39,7 +39,7 @@ public class SqlProducerSeparatorTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
index 33a1a331fab..a1baf473f9a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
@@ -42,7 +42,7 @@ public class SqlProducerToDTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java
index 35487521f11..77f28a87694 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerUseMessageBodyForSqlTest.java
@@ -43,7 +43,7 @@ public class SqlProducerUseMessageBodyForSqlTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
index bd875011cae..47d4fa43f02 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
@@ -40,7 +40,7 @@ public class SqlProducerWhereIssueTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
super.setUp();
@@ -66,10 +66,10 @@ public class SqlProducerWhereIssueTest extends CamelTestSupport {
List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
Map row = (Map) list.get(0);
assertEquals("ASF", row.get("LICENSE"));
- assertEquals(2, row.get("ROWCOUNT"));
+ assertEquals(2L, row.get("ROWCOUNT"));
row = (Map) list.get(1);
assertEquals("XXX", row.get("LICENSE"));
- assertEquals(1, row.get("ROWCOUNT"));
+ assertEquals(1L, row.get("ROWCOUNT"));
}
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
index fd7ad347f43..0dca41d2555 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
@@ -257,7 +257,7 @@ public class SqlRouteTest extends CamelTestSupport {
public void setUp() throws Exception {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY)
+ .setType(EmbeddedDatabaseType.H2)
.addScript("sql/createAndPopulateDatabase.sql").build();
jdbcTemplate = new JdbcTemplate(db);
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
index 81f06dae309..c7bcd46a9fc 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlTransactedRouteTest.java
@@ -61,7 +61,7 @@ public class SqlTransactedRouteTest extends CamelTestSupport {
db = new EmbeddedDatabaseBuilder()
.setName(getClass().getSimpleName())
- .setType(EmbeddedDatabaseType.DERBY).build();
+ .setType(EmbeddedDatabaseType.H2).build();
reg.bind("testdb", db);
DataSourceTransactionManager txMgr = new DataSourceTransactionManager();
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
index 07fef2602cd..4f1b8756fe2 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlEndpointLikeTest.xml
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- In Memory Database -->
- <jdbc:embedded-database id="{{testClassSimpleName}}" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}" type="H2">
<jdbc:script location="classpath:/sql/createAndPopulateDatabase.sql"/>
</jdbc:embedded-database>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
index dc282428eb7..24da110a95e 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/component/sql/SpringSqlMultilineTest.xml
@@ -25,7 +25,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- In Memory Database -->
- <jdbc:embedded-database id="{{testClassSimpleName}}" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}" type="H2">
<jdbc:script location="classpath:/sql/createAndPopulateDatabase.sql"/>
</jdbc:embedded-database>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
index cde76936a00..15df717cb4d 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/aggregate/jdbc/JdbcSpringDataSource.xml
@@ -37,27 +37,27 @@
<tx:annotation-driven transaction-manager="txManager"/>
<!-- In Memory Database #1 -->
- <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource1" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource1" type="H2">
<jdbc:script location="classpath:/sql/init.sql"/>
</jdbc:embedded-database>
<!-- In Memory Database #2 -->
- <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource2" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource2" type="H2">
<jdbc:script location="classpath:/sql/init2.sql"/>
</jdbc:embedded-database>
<!-- In Memory Database #3 -->
- <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource3" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource3" type="H2">
<jdbc:script location="classpath:/sql/init3.sql"/>
</jdbc:embedded-database>
<!-- In Memory Database #4 -->
- <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource4" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource4" type="H2">
<jdbc:script location="classpath:/sql/init4.sql"/>
</jdbc:embedded-database>
<!-- In Memory Database #5 -->
- <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource5" type="DERBY">
+ <jdbc:embedded-database id="{{testClassSimpleName}}-dataSource5" type="H2">
<jdbc:script location="classpath:/sql/init5.sql"/>
</jdbc:embedded-database>
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/cached-spring.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/cached-spring.xml
index 0f044b1a977..7a32a81db61 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/cached-spring.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/cached-spring.xml
@@ -27,7 +27,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- START SNIPPET: e1 -->
- <jdbc:embedded-database id="dataSource" type="DERBY" />
+ <jdbc:embedded-database id="dataSource" type="H2" />
<!-- END SNIPPET: e1 -->
<!-- START SNIPPET: e2 -->
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-spring.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-spring.xml
index 6d7c56f52ed..0ef71e927a5 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-spring.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-spring.xml
@@ -26,7 +26,7 @@
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:embedded-database id="dataSource" type="H2" />
<!-- START SNIPPET: e1 -->
<bean id="messageIdRepository" class="org.apache.camel.processor.idempotent.jdbc.JdbcMessageIdRepository">
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-tablename-spring.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-tablename-spring.xml
index 0a57d37833a..b5d255f3f4f 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-tablename-spring.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/customized-tablename-spring.xml
@@ -26,7 +26,7 @@
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:embedded-database id="dataSource" type="H2" />
<!-- START SNIPPET: e1 -->
<bean id="messageIdRepository" class="org.apache.camel.processor.idempotent.jdbc.JdbcMessageIdRepository">
diff --git a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/spring.xml b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/spring.xml
index e5d2a92d17e..4175f44ae67 100644
--- a/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/spring.xml
+++ b/components/camel-sql/src/test/resources/org/apache/camel/processor/idempotent/jdbc/spring.xml
@@ -27,7 +27,7 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<!-- START SNIPPET: e1 -->
- <jdbc:embedded-database id="dataSource" type="DERBY" />
+ <jdbc:embedded-database id="dataSource" type="H2" />
<!-- END SNIPPET: e1 -->
<!-- START SNIPPET: e2 -->