diff --git a/aggregate-dist/pom.xml b/aggregate-dist/pom.xml index 8a5f56a60..750e3cd77 100644 --- a/aggregate-dist/pom.xml +++ b/aggregate-dist/pom.xml @@ -79,9 +79,9 @@ camel-sql - org.apache.derby - derby - ${derby-version} + com.h2database + h2 + ${h2-version} diff --git a/aggregate-dist/src/main/java/org/apache/camel/example/Application.java b/aggregate-dist/src/main/java/org/apache/camel/example/Application.java index d090bfefb..47d8ad401 100644 --- a/aggregate-dist/src/main/java/org/apache/camel/example/Application.java +++ b/aggregate-dist/src/main/java/org/apache/camel/example/Application.java @@ -56,7 +56,7 @@ public final class Application { private static final int END = 100; private static final String CID_HEADER = "corrId"; - private static final String DB_URL = "jdbc:derby:target/testdb;create=true"; + private static final String DB_URL = "jdbc:h2:file:./target/testdb"; private static final String DB_USER = "admin"; private static final String DB_PASS = "admin"; @@ -153,7 +153,7 @@ private static AggregationRepository getAggregationRepository() { + "version bigint not null" + ")"); } catch (SQLException e) { - if (!e.getMessage().contains("already exists")) { + if (!e.getMessage().toLowerCase().contains("already exist")) { LOG.error("Database initialization failure", e); } } diff --git a/jdbc/README.adoc b/jdbc/README.adoc index 47a6dac8c..7003eed06 100644 --- a/jdbc/README.adoc +++ b/jdbc/README.adoc @@ -3,7 +3,7 @@ === Introduction This example shows how to use camel-jdbc component with an embedded -Apache Derby database. +H2 database. === Build diff --git a/jdbc/pom.xml b/jdbc/pom.xml index c127de4a9..41ff4a440 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -35,6 +35,7 @@ Database JDBC + 2.2.224 @@ -77,14 +78,9 @@ - org.apache.derby - derbytools - ${derby-version} - - - org.apache.derby - derby - ${derby-version} + com.h2database + h2 + ${h2-version} diff --git a/jdbc/src/main/resources/META-INF/spring/camel-context.xml b/jdbc/src/main/resources/META-INF/spring/camel-context.xml index 35a537b8b..15c740cd8 100644 --- a/jdbc/src/main/resources/META-INF/spring/camel-context.xml +++ b/jdbc/src/main/resources/META-INF/spring/camel-context.xml @@ -29,8 +29,8 @@ - - + +