From 4b2e01669b949c59100131c82c8c85178cc977e9 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@vmware.com>
Date: Tue, 19 Mar 2013 14:50:05 +0100
Subject: [PATCH] DATAJPA-316 - Added build profiles to build against Hibernate
 4.1 and 4.2.

Upgraded to Spring Data Build 1.0.2.RELEASE along the way. Needed to upgrade to HSQLDB 2.2.9 as Hibernate 4 doesn't work with HSQLDB versions 1.x. Set up OpenJPA test run to still use HSQLD 1.8.0.10 as OpenJPA does not work with HSQLDB 2.x. *sigh*
---
 pom.xml | 108 +++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 68 insertions(+), 40 deletions(-)

diff --git a/pom.xml b/pom.xml
index 98ca16269..88be2de2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,42 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-jpa</artifactId>
-    <version>1.3.1.BUILD-SNAPSHOT</version>
+	<modelVersion>4.0.0</modelVersion>
+	
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-jpa</artifactId>
+	<version>1.3.1.BUILD-SNAPSHOT</version>
 
-    <name>Spring Data JPA</name>
-    <description>Spring Data module for JPA repositories.</description>
-    <url>http://www.springframework.org/spring-data/jpa</url>
+	<name>Spring Data JPA</name>
+	<description>Spring Data module for JPA repositories.</description>
+	<url>http://www.springframework.org/spring-data/jpa</url>
 
-    <parent>
-        <groupId>org.springframework.data.build</groupId>
-        <artifactId>spring-data-parent</artifactId>
-        <version>1.0.0.RELEASE</version>
-        <relativePath>../spring-data-build/parent/pom.xml</relativePath>
-    </parent>
-    
-    <properties>
+	<parent>
+		<groupId>org.springframework.data.build</groupId>
+		<artifactId>spring-data-parent</artifactId>
+		<version>1.0.2.RELEASE</version>
+		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
+	</parent>
+	
+	<properties>
 
-    	<dist.key>DATAJPA</dist.key>
-    	
-    	<eclipselink>2.4.0</eclipselink>
-    	<hibernate>3.6.10.Final</hibernate>
-    	<jpa>2.0.0</jpa>
-    	<openjpa>2.2.0</openjpa>
-    	<springdata.commons>1.5.0.RELEASE</springdata.commons>
-    	
-    </properties>
+		<dist.key>DATAJPA</dist.key>
+		
+		<eclipselink>2.4.0</eclipselink>
+		<hibernate>3.6.10.Final</hibernate>
+		<hsqldb1>1.8.0.10</hsqldb1>
+		<jpa>2.0.0</jpa>
+		<openjpa>2.2.1</openjpa>
+		<springdata.commons>1.5.0.RELEASE</springdata.commons>
+		
+	</properties>
 
-    <dependencies>
-    
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>${springdata.commons}</version>
-        </dependency>
+	<profiles>
+		<profile>
+			<id>hibernate-41</id>
+			<properties>
+				<hibernate>4.1.11.Final</hibernate>
+			</properties>
+		</profile>
+		<profile>
+			<id>hibernate-42</id>
+			<properties>
+				<hibernate>4.2.0.Final</hibernate>
+			</properties>
+		</profile>
+	</profiles>
+
+	<dependencies>
+	
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${springdata.commons}</version>
+		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -108,7 +124,7 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>1.8.0.10</version>
+			<version>2.2.8</version>
 			<scope>test</scope>
 		</dependency>
 		
@@ -204,11 +220,11 @@
 			<scope>test</scope>
 		</dependency>
 		
-    </dependencies>
-    
-    <build>
-    	<plugins>
-    		<plugin>
+	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.12</version>
@@ -225,6 +241,12 @@
 						<version>${openjpa}</version>
 						<scope>runtime</scope>
 					</dependency>
+				<dependency>
+						<groupId>org.hsqldb</groupId>
+						<artifactId>hsqldb</artifactId>
+						<version>${hsqldb1}</version>
+						<scope>runtime</scope>
+					</dependency>
 				</dependencies>
 				<configuration>
 					<excludes>
@@ -296,6 +318,12 @@
 								<include>**/OpenJpa*Tests.java</include>
 							</includes>
 							<argLine>-javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa}/openjpa-${openjpa}.jar</argLine>
+						<classpathDependencyExcludes>
+								<classpathDepencyExclude>org.hsqldb:hsqldb</classpathDepencyExclude>
+							</classpathDependencyExcludes>
+							<additionalClasspathElements>
+								<additionalClasspathElement>${settings.localRepository}/org/hsqldb/hsqldb/${hsqldb1}/hsqldb-${hsqldb1}.jar</additionalClasspathElement>
+							</additionalClasspathElements>
 						</configuration>
 					</execution>
 				</executions>
@@ -383,7 +411,7 @@
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>wagon-maven-plugin</artifactId>
 			</plugin>
-    	</plugins>
-    </build>
+		</plugins>
+	</build>
 
 </project>