From a764ea117d747920acf504d9fac058f7f42e18f5 Mon Sep 17 00:00:00 2001
From: "kuld.cs.mishra@gmail.com" <kuld.cs.mishra@gmail.com>
Date: Wed, 29 May 2013 20:04:29 +0530
Subject: [PATCH] Changed pom.xml for hibernate dependency and changed hsqldb
 version

---
 kundera-core/pom.xml         |  2 +-
 kundera-hbase/pom.xml        | 24 ++++++++++++------------
 kundera-mongo/pom.xml        | 10 +++++++++-
 kundera-neo4j/pom.xml        | 10 +++++++++-
 kundera-oracle-nosql/pom.xml |  7 +++++++
 kundera-rdbms/pom.xml        |  6 +++---
 kundera-redis/pom.xml        |  9 ++++++++-
 kundera-rest/pom.xml         |  9 ++++++++-
 kundera-tests/pom.xml        | 20 +++++++++-----------
 9 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/kundera-core/pom.xml b/kundera-core/pom.xml
index 8e56ccdfd..0a109bd45 100644
--- a/kundera-core/pom.xml
+++ b/kundera-core/pom.xml
@@ -79,7 +79,7 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>4.1.7.Final</version>
-      <optional>true</optional>
+			<optional>true</optional>
 		</dependency>
 
 		<dependency>
diff --git a/kundera-hbase/pom.xml b/kundera-hbase/pom.xml
index 9df31950b..2794795a9 100644
--- a/kundera-hbase/pom.xml
+++ b/kundera-hbase/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -11,7 +12,7 @@
 	<packaging>jar</packaging>
 	<name>kundera-hbase</name>
 	<url>http://maven.apache.org</url>
-	
+
 	<properties>
 		<hadoop.version>1.1.1</hadoop.version>
 		<hbase.version>0.94.3</hbase.version>
@@ -76,6 +77,12 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.1.7.Final</version>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -111,16 +118,9 @@
 					</execution>
 				</executions>
 			</plugin>
-			<!-- <plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.6</version>
-				<configuration>
-					<excludes>
-						<exclude>**/datatypes/*.java</exclude>
-					</excludes>
-				</configuration>
-			</plugin> -->
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> 
+				<version>2.6</version> <configuration> <excludes> <exclude>**/datatypes/*.java</exclude> 
+				</excludes> </configuration> </plugin> -->
 		</plugins>
 	</build>
 
diff --git a/kundera-mongo/pom.xml b/kundera-mongo/pom.xml
index cfd44e650..450e5da24 100644
--- a/kundera-mongo/pom.xml
+++ b/kundera-mongo/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -39,6 +40,13 @@
 		</dependency>
 
 		<!-- contiperf dependency should not be here -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.1.7.Final</version>
+			<scope>test</scope>
+		</dependency>
+
 
 		<dependency>
 			<groupId>org.databene</groupId>
diff --git a/kundera-neo4j/pom.xml b/kundera-neo4j/pom.xml
index 6ecd4fafb..d532102fd 100644
--- a/kundera-neo4j/pom.xml
+++ b/kundera-neo4j/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.impetus</groupId>
@@ -61,6 +62,13 @@
 			<artifactId>jersey-client</artifactId>
 			<version>1.12</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.1.7.Final</version>
+			<scope>test</scope>
+		</dependency>
+
 
 	</dependencies>
 	<build>
diff --git a/kundera-oracle-nosql/pom.xml b/kundera-oracle-nosql/pom.xml
index 008e00486..1c6a2e0c3 100644
--- a/kundera-oracle-nosql/pom.xml
+++ b/kundera-oracle-nosql/pom.xml
@@ -63,6 +63,13 @@
 			<version>4.5</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.1.7.Final</version>
+			<scope>test</scope>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.eclipse.jetty</groupId>
 			<artifactId>jetty-util</artifactId>
diff --git a/kundera-rdbms/pom.xml b/kundera-rdbms/pom.xml
index 66f0ee13f..ae587d3f6 100644
--- a/kundera-rdbms/pom.xml
+++ b/kundera-rdbms/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>kundera</artifactId>
@@ -43,7 +44,6 @@
 			<version>1.8.0.7</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
@@ -70,7 +70,7 @@
 					</descriptorRefs>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
diff --git a/kundera-redis/pom.xml b/kundera-redis/pom.xml
index 55ad5e716..0bac73ef5 100644
--- a/kundera-redis/pom.xml
+++ b/kundera-redis/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>kundera</artifactId>
@@ -32,6 +33,12 @@
 			<scope>test</scope>
 		</dependency>
 		<!-- contiperf dependency should not be here -->
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.1.7.Final</version>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>org.databene</groupId>
diff --git a/kundera-rest/pom.xml b/kundera-rest/pom.xml
index 386ae851d..64d0bdabd 100644
--- a/kundera-rest/pom.xml
+++ b/kundera-rest/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>kundera</artifactId>
@@ -64,6 +65,12 @@
 			<artifactId>jersey-server</artifactId>
 			<version>1.12</version>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>4.1.7.Final</version>
+			<scope>test</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>com.sun.jersey</groupId>
diff --git a/kundera-tests/pom.xml b/kundera-tests/pom.xml
index 1050048ee..54d7f1b00 100644
--- a/kundera-tests/pom.xml
+++ b/kundera-tests/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.impetus</groupId>
@@ -134,9 +135,9 @@
 			<version>5.1.6</version> <scope>test</scope> </dependency> -->
 
 		<dependency>
-			<groupId>hsqldb</groupId>
+			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.7</version>
+			<version>2.2.9</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -339,7 +340,7 @@
 			<artifactId>kundera-rest</artifactId>
 			<version>2.6-SNAPSHOT</version>
 		</dependency>
-	    <dependency>
+		<dependency>
 			<groupId>com.impetus.client</groupId>
 			<artifactId>kundera-oracle-nosql</artifactId>
 			<version>2.6-SNAPSHOT</version>
@@ -417,18 +418,15 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-		<!-- <dependency>
-			<groupId>com.impetus.client</groupId>
-			<artifactId>kundera-oracle-nosql</artifactId>
-			<version>2.5-SNAPSHOT</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency> -->
+		<!-- <dependency> <groupId>com.impetus.client</groupId> <artifactId>kundera-oracle-nosql</artifactId> 
+			<version>2.5-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> 
+			</dependency> -->
 
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>4.1.7.Final</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>