Merge remote-tracking branch 'gekkio/hibernate4'

Agilefant · Mar 14, 2013 · 0991ae9 · 0991ae9
2 parents 2506a1c + f9ddaee
commit 0991ae9
Show file tree

Hide file tree

Showing 66 changed files with 438 additions and 1,320 deletions.
diff --git a/distribution/assembly.xml b/distribution/assembly.xml
@@ -24,20 +24,12 @@
 			<source>doc/Release_notes.txt</source>
 			<outputDirectory>/</outputDirectory>
 		</file>
-		<file>
-			<source>doc/Summary_about_used_libraries.txt</source>
-			<outputDirectory>/</outputDirectory>
-		</file>
 		<file>
 			<source>doc/Install.txt</source>
 			<outputDirectory>/</outputDirectory>
 		</file>
 	</files>
 	<fileSets>
-		<fileSet>
-			<directory>doc/upgrade</directory>
-			<outputDirectory>/upgrade</outputDirectory>
-		</fileSet>
 		<fileSet>
 			<directory>doc/sql/upgrader</directory>
 			<outputDirectory>/upgrade</outputDirectory>

diff --git a/distribution/doc/Summary_about_used_libraries.txt b/distribution/doc/Summary_about_used_libraries.txt
diff --git a/distribution/doc/dev/Actions.txt b/distribution/doc/dev/Actions.txt
diff --git a/distribution/doc/dev/DAOs.txt b/distribution/doc/dev/DAOs.txt
diff --git a/distribution/doc/dev/README_for_developers.txt b/distribution/doc/dev/README_for_developers.txt
diff --git a/distribution/doc/dev/hibernate_DAOs.txt b/distribution/doc/dev/hibernate_DAOs.txt
diff --git a/distribution/doc/dev/tags.txt b/distribution/doc/dev/tags.txt
diff --git a/distribution/doc/upgrade/README.txt b/distribution/doc/upgrade/README.txt
diff --git a/pom.xml b/pom.xml
@@ -25,8 +25,8 @@
 		<glassfish.jstl.version>1.2</glassfish.jstl.version>
 		<guava.version>13.0.1</guava.version>
 		<h2.version>1.1.114</h2.version>
-		<hibernate.version>3.5.3-Final</hibernate.version>
-		<hibernate.validator.version>3.1.0.GA</hibernate.validator.version>
+		<hibernate.version>4.1.9.Final</hibernate.version>
+		<hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
 		<httpclient.version>4.1.3</httpclient.version>
 		<javax.annotation.version>1.0</javax.annotation.version>
 		<javax.mail.version>1.4.5</javax.mail.version>
@@ -36,7 +36,6 @@
 		<jersey.version>1.17</jersey.version>
 		<jfreechart.version>1.0.14</jfreechart.version>
 		<joda.time.version>2.1</joda.time.version>
-		<joda.time.hibernate.version>1.2</joda.time.hibernate.version>
 		<joda.time.jsptags.version>1.1.1</joda.time.jsptags.version>
 		<junit.version>4.11</junit.version>
 		<logback.version>1.0.9</logback.version>
@@ -47,8 +46,9 @@
 		<spring.version>3.2.1.RELEASE</spring.version>
 		<spring.security.version>3.1.3.RELEASE</spring.security.version>
 		<stringtemplate.version>3.0</stringtemplate.version>
-		<struts.version>2.1.8.1</struts.version>
+		<struts.version>2.2.3.1</struts.version>
 		<typesafe.config.version>1.0.0</typesafe.config.version>
+		<usertype.version>3.0.0.GA</usertype.version>
 
 		<maven.compiler.version>3.0</maven.compiler.version>
 		<maven.war.version>2.3</maven.war.version>
@@ -197,37 +197,6 @@
 				<artifactId>joda-time</artifactId>
 				<version>${joda.time.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>joda-time</groupId>
-				<artifactId>joda-time-hibernate</artifactId>
-				<version>${joda.time.hibernate.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>antlr</artifactId>
-						<groupId>antlr</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>cglib-full</artifactId>
-						<groupId>cglib</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>commons-logging-api</artifactId>
-						<groupId>commons-logging</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>hsqldb</artifactId>
-						<groupId>hsqldb</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>ehcache</artifactId>
-						<groupId>ehcache</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>hibernate</artifactId>
-						<groupId>org.hibernate</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>joda-time</groupId>
 				<artifactId>joda-time-jsptags</artifactId>
@@ -284,18 +253,18 @@
 				<groupId>org.apache.struts</groupId>
 				<artifactId>struts2-core</artifactId>
 				<version>${struts.version}</version>
+				<exclusions>
+					<exclusion>
+						<!-- Invalid groupId -->
+						<groupId>javassist</groupId>
+						<artifactId>javassist</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.struts</groupId>
 				<artifactId>struts2-junit-plugin</artifactId>
 				<version>${struts.version}</version>
-				<exclusions>
-					<!-- No longer exists in Spring >= 2.5 -->
-					<exclusion>
-						<groupId>org.springframework</groupId>
-						<artifactId>spring-mock</artifactId>
-					</exclusion>
-				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.apache.struts</groupId>
@@ -316,13 +285,6 @@
 				<groupId>org.easymock</groupId>
 				<artifactId>easymock</artifactId>
 				<version>${easymock.version}</version>
-				<exclusions>
-					<!-- Prevent duplicate cglib + cglib-nodep dependencies -->
-					<exclusion>
-						<groupId>cglib</groupId>
-						<artifactId>cglib-nodep</artifactId>
-					</exclusion>
-				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.easymock</groupId>
@@ -380,6 +342,11 @@
 				<artifactId>hibernate-validator</artifactId>
 				<version>${hibernate.validator.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.jadira.usertype</groupId>
+				<artifactId>usertype.core</artifactId>
+				<version>${usertype.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.jfree</groupId>
 				<artifactId>jfreechart</artifactId>

diff --git a/webapp/legacy/database-mysql5.properties b/webapp/legacy/database-mysql5.properties