Author: cmueller
Date: Sun Jun 3 16:40:40 2012
New Revision: 1345702
URL: http://svn.apache.org/viewvc?rev=1345702&view=rev
Log:
CAMEL-5327: Upgrade to Hibernate 3.6.6-Final
Modified:
camel/trunk/components/camel-bam/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
Modified: camel/trunk/components/camel-bam/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/pom.xml?rev=1345702&r1=1345701&r2=1345702&view=diff
==============================================================================
--- camel/trunk/components/camel-bam/pom.xml (original)
+++ camel/trunk/components/camel-bam/pom.xml Sun Jun 3 16:40:40 2012
@@ -124,11 +124,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
<scope>test</scope>
Modified: camel/trunk/examples/camel-example-bam/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-bam/pom.xml?rev=1345702&r1=1345701&r2=1345702&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-bam/pom.xml (original)
+++ camel/trunk/examples/camel-example-bam/pom.xml Sun Jun 3 16:40:40 2012
@@ -80,10 +80,6 @@
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
</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=1345702&r1=1345701&r2=1345702&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-etl/pom.xml (original)
+++ camel/trunk/examples/camel-example-etl/pom.xml Sun Jun 3 16:40:40 2012
@@ -175,10 +175,6 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </dependency>
</dependencies>
</profile>
<profile>
Modified: camel/trunk/examples/camel-example-tracer/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-tracer/pom.xml?rev=1345702&r1=1345701&r2=1345702&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-tracer/pom.xml (original)
+++ camel/trunk/examples/camel-example-tracer/pom.xml Sun Jun 3 16:40:40 2012
@@ -60,10 +60,6 @@
<artifactId>hibernate-entitymanager</artifactId>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
- </dependency>
- <dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
</dependency>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1345702&r1=1345701&r2=1345702&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Jun 3 16:40:40 2012
@@ -94,8 +94,7 @@
<hawtdb-version>1.6</hawtdb-version>
<hazelcast-version>2.0.2</hazelcast-version>
<hbase-version>0.90.5</hbase-version>
- <hibernate-version>3.2.6.ga</hibernate-version>
- <hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
+ <hibernate-version>3.6.10.Final</hibernate-version>
<hsqldb-version>2.2.8</hsqldb-version>
<httpunit-version>1.6.2</httpunit-version>
<httpcore4-version>4.1.4</httpcore4-version>
@@ -1432,11 +1431,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate-entitymanager-version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate</artifactId>
<version>${hibernate-version}</version>
<exclusions>
<exclusion>