From e5d84e80b836ed0939e1546300d75fd93b637d8b Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 31 Mar 2014 13:08:02 +0200
Subject: update Hibernate, JPA and mySQL libraries

---
 id/server/moa-id-commons/pom.xml                       | 18 +++++++++++-------
 .../moa/id/commons/db/MOASessionDBUtils.java           |  7 ++++++-
 .../moa/id/commons/db/StatisticLogDBUtils.java         |  7 ++++++-
 3 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'id/server/moa-id-commons')

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 0ddf06259..e494033a0 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -21,23 +21,23 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<version>4.2.1.Final</version>
+			<version>4.3.4.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-c3p0</artifactId>
-			<version>4.2.1.Final</version>
+			<version>4.3.4.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>4.2.1.Final</version>
+			<version>4.3.4.Final</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.1</version>
+			<version>3.3.1</version>
 		</dependency>
 		<dependency>
 			<groupId>MOA</groupId>
@@ -53,8 +53,8 @@
 					
 		<dependency>
 			<groupId>org.hibernate.javax.persistence</groupId>
-			<artifactId>hibernate-jpa-2.0-api</artifactId>
-			<version>1.0.1.Final</version>
+			<artifactId>hibernate-jpa-2.1-api</artifactId>
+			<version>1.0.0.Final</version>
 		</dependency>
 				
 		<dependency>
@@ -71,12 +71,16 @@
 			        <groupId>org.slf4j</groupId>
 			        <artifactId>slf4j-log4j12</artifactId>			        
 			    </exclusion>
+			    <exclusion>
+			    		<groupId>org.hibernate.javax.persistence</groupId>
+							<artifactId>hibernate-jpa-2.0-api</artifactId>
+			    </exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
-			<version>5.1.25</version>
+			<version>5.1.29</version>
 		</dependency>
   </dependencies>
   
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
index 0065f2242..76215528d 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/MOASessionDBUtils.java
@@ -29,6 +29,7 @@ import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.service.ServiceRegistryBuilder;
@@ -67,7 +68,11 @@ public final class MOASessionDBUtils {
        Logger.debug("Creating initial MOASession session factory...");
               
        config.configure("hibernate_moasession.cfg.xml");
-       serviceRegistry = new ServiceRegistryBuilder().applySettings(config.getProperties()).buildServiceRegistry();
+       //serviceRegistry = new ServiceRegistryBuilder().applySettings(config.getProperties()).buildServiceRegistry();
+       
+       serviceRegistry = new StandardServiceRegistryBuilder().
+    		   applySettings(config.getProperties()).build();
+       
        sessionFactory = config.buildSessionFactory(serviceRegistry);
        Logger.debug("Initial MOASession session factory successfully created.");
        
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java
index fac653eb2..eac47f93f 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/StatisticLogDBUtils.java
@@ -29,6 +29,7 @@ import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.service.ServiceRegistryBuilder;
@@ -67,7 +68,11 @@ public final class StatisticLogDBUtils {
        Logger.debug("Creating initial StatisicLogger session factory...");
               
        config.configure("hibernate_statistic.cfg.xml");
-       serviceRegistry = new ServiceRegistryBuilder().applySettings(config.getProperties()).buildServiceRegistry();
+       //serviceRegistry = new ServiceRegistryBuilder().applySettings(config.getProperties()).buildServiceRegistry();
+       
+       serviceRegistry = new StandardServiceRegistryBuilder().
+    		   applySettings(config.getProperties()).build();
+       
        sessionFactory = config.buildSessionFactory(serviceRegistry);
        Logger.debug("Initial StatisicLogger session factory successfully created.");
        
-- 
cgit v1.2.3