You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/11/30 00:35:12 UTC
svn commit: r1208138 - in /camel/trunk: components/camel-bam/
components/camel-ibatis/ components/camel-jdbc/ components/camel-mybatis/
components/camel-spring/ components/camel-sql/ examples/camel-example-bam/
examples/camel-example-etl/ examples/came...
Author: cmueller
Date: Tue Nov 29 23:35:08 2011
New Revision: 1208138
URL: http://svn.apache.org/viewvc?rev=1208138&view=rev
Log:
CAMEL-4726: Upgrade org.hsqldb:hsqldb 1.8.0.10 -> 2.2.6
Modified:
camel/trunk/components/camel-bam/pom.xml
camel/trunk/components/camel-ibatis/pom.xml
camel/trunk/components/camel-jdbc/pom.xml
camel/trunk/components/camel-mybatis/pom.xml
camel/trunk/components/camel-spring/pom.xml
camel/trunk/components/camel-sql/pom.xml
camel/trunk/examples/camel-example-bam/pom.xml
camel/trunk/examples/camel-example-etl/pom.xml
camel/trunk/examples/camel-example-tracer/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tests/camel-itest/pom.xml
Modified: camel/trunk/components/camel-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/pom.xml (original)
+++ camel/trunk/components/camel-bam/pom.xml Tue Nov 29 23:35:08 2011
@@ -116,7 +116,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
@@ -222,7 +222,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
@@ -303,7 +303,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-ibatis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/components/camel-ibatis/pom.xml (original)
+++ camel/trunk/components/camel-ibatis/pom.xml Tue Nov 29 23:35:08 2011
@@ -54,7 +54,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/pom.xml (original)
+++ camel/trunk/components/camel-jdbc/pom.xml Tue Nov 29 23:35:08 2011
@@ -63,7 +63,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-mybatis/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/components/camel-mybatis/pom.xml (original)
+++ camel/trunk/components/camel-mybatis/pom.xml Tue Nov 29 23:35:08 2011
@@ -54,7 +54,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Tue Nov 29 23:35:08 2011
@@ -160,7 +160,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-sql/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/pom.xml (original)
+++ camel/trunk/components/camel-sql/pom.xml Tue Nov 29 23:35:08 2011
@@ -76,7 +76,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
</dependency>
Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Tue Nov 29 23:35:08 2011
@@ -88,7 +88,7 @@
<artifactId>hibernate</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
Modified: camel/trunk/examples/camel-example-etl/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ camel/trunk/examples/camel-example-etl/pom.xml Tue Nov 29 23:35:08 2011
@@ -71,7 +71,7 @@
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
@@ -289,7 +289,7 @@
<version>1.2.0</version>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
</dependencies>
Modified: camel/trunk/examples/camel-example-tracer/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/pom.xml (original)
+++ camel/trunk/examples/camel-example-tracer/pom.xml Tue Nov 29 23:35:08 2011
@@ -68,7 +68,7 @@
<artifactId>hibernate</artifactId>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
<dependency>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Nov 29 23:35:08 2011
@@ -88,7 +88,7 @@
<hazelcast-version>1.9.3</hazelcast-version>
<hibernate-version>3.2.6.ga</hibernate-version>
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
- <hsqldb-version>1.8.0.10</hsqldb-version>
+ <hsqldb-version>2.2.6</hsqldb-version>
<httpunit-version>1.6.2</httpunit-version>
<httpcore4-version>4.1.2</httpcore4-version>
<httpclient4-version>4.1.2</httpclient4-version>
@@ -1368,7 +1368,7 @@
<version>${derby-version}</version>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb-version}</version>
</dependency>
Modified: camel/trunk/tests/camel-itest/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Tue Nov 29 23:35:08 2011
@@ -186,9 +186,8 @@
<!-- some TX tests using iBatis -->
<dependency>
- <groupId>hsqldb</groupId>
+ <groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
- <version>1.8.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
Re: svn commit: r1208138 - in /camel/trunk: components/camel-bam/
components/camel-ibatis/ components/camel-jdbc/ components/camel-mybatis/
components/camel-spring/ components/camel-sql/ examples/camel-example-bam/
examples/camel-example-etl/ examples/came...
Posted by Hadrian Zbarcea <hz...@gmail.com>.
Christian,
I think this upgrade broke the trunk, camel-spring in particular. It is
quite likely that it uncovered a problem in Camel. Looking into it.
Cheers,
Hadrian
On 11/29/2011 06:35 PM, cmueller@apache.org wrote:
> Author: cmueller
> Date: Tue Nov 29 23:35:08 2011
> New Revision: 1208138
>
> URL: http://svn.apache.org/viewvc?rev=1208138&view=rev
> Log:
> CAMEL-4726: Upgrade org.hsqldb:hsqldb 1.8.0.10 -> 2.2.6
>
> Modified:
> camel/trunk/components/camel-bam/pom.xml
> camel/trunk/components/camel-ibatis/pom.xml
> camel/trunk/components/camel-jdbc/pom.xml
> camel/trunk/components/camel-mybatis/pom.xml
> camel/trunk/components/camel-spring/pom.xml
> camel/trunk/components/camel-sql/pom.xml
> camel/trunk/examples/camel-example-bam/pom.xml
> camel/trunk/examples/camel-example-etl/pom.xml
> camel/trunk/examples/camel-example-tracer/pom.xml
> camel/trunk/parent/pom.xml
> camel/trunk/tests/camel-itest/pom.xml
>
> Modified: camel/trunk/components/camel-bam/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-bam/pom.xml (original)
> +++ camel/trunk/components/camel-bam/pom.xml Tue Nov 29 23:35:08 2011
> @@ -116,7 +116,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>hsqldb</groupId>
> + <groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
> @@ -222,7 +222,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>hsqldb</groupId>
> + <groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
> @@ -303,7 +303,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>hsqldb</groupId>
> + <groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
>
> Modified: camel/trunk/components/camel-ibatis/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ibatis/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-ibatis/pom.xml (original)
> +++ camel/trunk/components/camel-ibatis/pom.xml Tue Nov 29 23:35:08 2011
> @@ -54,7 +54,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
>
> Modified: camel/trunk/components/camel-jdbc/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-jdbc/pom.xml (original)
> +++ camel/trunk/components/camel-jdbc/pom.xml Tue Nov 29 23:35:08 2011
> @@ -63,7 +63,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
>
> Modified: camel/trunk/components/camel-mybatis/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mybatis/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-mybatis/pom.xml (original)
> +++ camel/trunk/components/camel-mybatis/pom.xml Tue Nov 29 23:35:08 2011
> @@ -54,7 +54,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
>
> Modified: camel/trunk/components/camel-spring/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-spring/pom.xml (original)
> +++ camel/trunk/components/camel-spring/pom.xml Tue Nov 29 23:35:08 2011
> @@ -160,7 +160,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
>
> Modified: camel/trunk/components/camel-sql/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/components/camel-sql/pom.xml (original)
> +++ camel/trunk/components/camel-sql/pom.xml Tue Nov 29 23:35:08 2011
> @@ -76,7 +76,7 @@
> <scope>test</scope>
> </dependency>
> <dependency>
> - <groupId>hsqldb</groupId>
> + <groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <scope>test</scope>
> </dependency>
>
> Modified: camel/trunk/examples/camel-example-bam/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/examples/camel-example-bam/pom.xml (original)
> +++ camel/trunk/examples/camel-example-bam/pom.xml Tue Nov 29 23:35:08 2011
> @@ -88,7 +88,7 @@
> <artifactId>hibernate</artifactId>
> </dependency>
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> </dependency>
> <dependency>
>
> Modified: camel/trunk/examples/camel-example-etl/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-etl/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/examples/camel-example-etl/pom.xml (original)
> +++ camel/trunk/examples/camel-example-etl/pom.xml Tue Nov 29 23:35:08 2011
> @@ -71,7 +71,7 @@
> </dependency>
>
> <dependency>
> - <groupId>hsqldb</groupId>
> + <groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> </dependency>
> <dependency>
> @@ -289,7 +289,7 @@
> <version>1.2.0</version>
> </dependency>
> <dependency>
> - <groupId>hsqldb</groupId>
> + <groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> </dependency>
> </dependencies>
>
> Modified: camel/trunk/examples/camel-example-tracer/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/examples/camel-example-tracer/pom.xml (original)
> +++ camel/trunk/examples/camel-example-tracer/pom.xml Tue Nov 29 23:35:08 2011
> @@ -68,7 +68,7 @@
> <artifactId>hibernate</artifactId>
> </dependency>
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> </dependency>
> <dependency>
>
> Modified: camel/trunk/parent/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/parent/pom.xml (original)
> +++ camel/trunk/parent/pom.xml Tue Nov 29 23:35:08 2011
> @@ -88,7 +88,7 @@
> <hazelcast-version>1.9.3</hazelcast-version>
> <hibernate-version>3.2.6.ga</hibernate-version>
> <hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
> -<hsqldb-version>1.8.0.10</hsqldb-version>
> +<hsqldb-version>2.2.6</hsqldb-version>
> <httpunit-version>1.6.2</httpunit-version>
> <httpcore4-version>4.1.2</httpcore4-version>
> <httpclient4-version>4.1.2</httpclient4-version>
> @@ -1368,7 +1368,7 @@
> <version>${derby-version}</version>
> </dependency>
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> <version>${hsqldb-version}</version>
> </dependency>
>
> Modified: camel/trunk/tests/camel-itest/pom.xml
> URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1208138&r1=1208137&r2=1208138&view=diff
> ==============================================================================
> --- camel/trunk/tests/camel-itest/pom.xml (original)
> +++ camel/trunk/tests/camel-itest/pom.xml Tue Nov 29 23:35:08 2011
> @@ -186,9 +186,8 @@
>
> <!-- some TX tests using iBatis -->
> <dependency>
> -<groupId>hsqldb</groupId>
> +<groupId>org.hsqldb</groupId>
> <artifactId>hsqldb</artifactId>
> -<version>1.8.0.10</version>
> <scope>test</scope>
> </dependency>
> <dependency>
>
>
--
Hadrian Zbarcea
Principal Software Architect
Talend, Inc
http://coders.talend.com/
http://camelbot.blogspot.com/