From e412b13818ba6aea0188b9622d3db78e069b94d9 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Mon, 19 Aug 2013 21:34:24 +0300
Subject: [PATCH] hibernate and other maven upgrades

---
 experiments/pom.xml                                         | 4 ++--
 spring-all/pom.xml                                          | 4 ++--
 spring-exceptions/pom.xml                                   | 2 +-
 spring-hibernate3/pom.xml                                   | 2 +-
 spring-hibernate4/pom.xml                                   | 2 +-
 .../java/org/baeldung/persistence/dao/impl/ChildDao.java    | 5 -----
 .../main/java/org/baeldung/persistence/dao/impl/FooDao.java | 5 -----
 .../java/org/baeldung/persistence/dao/impl/ParentDao.java   | 5 -----
 spring-jpa/pom.xml                                          | 6 +++---
 spring-mvc-java/pom.xml                                     | 4 ++--
 spring-mvc-no-xml/pom.xml                                   | 2 +-
 spring-mvc-xml/pom.xml                                      | 2 +-
 spring-rest/pom.xml                                         | 4 ++--
 spring-security-basic-auth/pom.xml                          | 4 ++--
 spring-security-mvc-custom/pom.xml                          | 4 ++--
 spring-security-mvc-digest-auth/pom.xml                     | 4 ++--
 spring-security-mvc-login/pom.xml                           | 4 ++--
 spring-security-mvc-session/pom.xml                         | 4 ++--
 spring-security-rest-basic-auth/pom.xml                     | 4 ++--
 spring-security-rest-custom/pom.xml                         | 4 ++--
 spring-security-rest-digest-auth/pom.xml                    | 4 ++--
 spring-security-rest-full/pom.xml                           | 6 +++---
 spring-security-rest/pom.xml                                | 4 ++--
 23 files changed, 37 insertions(+), 52 deletions(-)

diff --git a/experiments/pom.xml b/experiments/pom.xml
index e4a9ba6779..f92ef16c8d 100644
--- a/experiments/pom.xml
+++ b/experiments/pom.xml
@@ -249,7 +249,7 @@
 		<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
-		<hibernate.version>4.2.3.Final</hibernate.version>
+		<hibernate.version>4.2.4.Final</hibernate.version>
 		<mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
 		<!-- logging -->
@@ -276,7 +276,7 @@
 
 		<!-- Maven plugins -->
 		<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-		<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 	</properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index 3b04b609e6..12ac684ffd 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -188,7 +188,7 @@
         <jstl.version>1.2</jstl.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -215,7 +215,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index 002ee4c258..3e4f4f1241 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -227,7 +227,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml
index 6cd53b23c7..9cb4b4d01a 100644
--- a/spring-hibernate3/pom.xml
+++ b/spring-hibernate3/pom.xml
@@ -191,7 +191,7 @@
 
 		<!-- Maven plugins -->
 		<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-		<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 	</properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml
index e445098b1c..6c9d64c519 100644
--- a/spring-hibernate4/pom.xml
+++ b/spring-hibernate4/pom.xml
@@ -199,7 +199,7 @@
 
 		<!-- Maven plugins -->
 		<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-		<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 	</properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
index d9c8fdceec..017362bd14 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
@@ -3,16 +3,11 @@ package org.baeldung.persistence.dao.impl;
 import org.baeldung.persistence.dao.IChildDao;
 import org.baeldung.persistence.dao.common.AbstractHibernateDao;
 import org.baeldung.persistence.model.Child;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class ChildDao extends AbstractHibernateDao<Child> implements IChildDao {
 
-    @Autowired
-    private SessionFactory sessionFactory;
-
     public ChildDao() {
         super();
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
index 4441215a94..b8360160da 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
@@ -3,16 +3,11 @@ package org.baeldung.persistence.dao.impl;
 import org.baeldung.persistence.dao.IFooDao;
 import org.baeldung.persistence.dao.common.AbstractHibernateDao;
 import org.baeldung.persistence.model.Foo;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class FooDao extends AbstractHibernateDao<Foo> implements IFooDao {
 
-    @Autowired
-    private SessionFactory sessionFactory;
-
     public FooDao() {
         super();
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
index 003ec62741..a93f1c39d5 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
@@ -3,16 +3,11 @@ package org.baeldung.persistence.dao.impl;
 import org.baeldung.persistence.dao.IParentDao;
 import org.baeldung.persistence.dao.common.AbstractHibernateDao;
 import org.baeldung.persistence.model.Parent;
-import org.hibernate.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class ParentDao extends AbstractHibernateDao<Parent> implements IParentDao {
 
-    @Autowired
-    private SessionFactory sessionFactory;
-
     public ParentDao() {
         super();
 
diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml
index d9109ae593..65c6bace87 100644
--- a/spring-jpa/pom.xml
+++ b/spring-jpa/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>
-            <version>3.17.1-GA</version>
+            <version>3.18.0-GA</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -164,7 +164,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -191,7 +191,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-mvc-java/pom.xml b/spring-mvc-java/pom.xml
index a7fe6a3c52..038e70b845 100644
--- a/spring-mvc-java/pom.xml
+++ b/spring-mvc-java/pom.xml
@@ -125,7 +125,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -152,7 +152,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-mvc-no-xml/pom.xml b/spring-mvc-no-xml/pom.xml
index 5235eb422e..ea0f92cdfd 100644
--- a/spring-mvc-no-xml/pom.xml
+++ b/spring-mvc-no-xml/pom.xml
@@ -129,7 +129,7 @@
 
 		<!-- Maven plugins -->
 		<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-		<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 		<maven-war-plugin.version>2.4</maven-war-plugin.version>
 	</properties>
 
diff --git a/spring-mvc-xml/pom.xml b/spring-mvc-xml/pom.xml
index 4dbe0120eb..eb390e738a 100644
--- a/spring-mvc-xml/pom.xml
+++ b/spring-mvc-xml/pom.xml
@@ -120,7 +120,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 	</properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-rest/pom.xml b/spring-rest/pom.xml
index 5d55c5ea8a..d4c58cd7bb 100644
--- a/spring-rest/pom.xml
+++ b/spring-rest/pom.xml
@@ -125,7 +125,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -152,7 +152,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-basic-auth/pom.xml b/spring-security-basic-auth/pom.xml
index 616ce4140c..e389553aad 100644
--- a/spring-security-basic-auth/pom.xml
+++ b/spring-security-basic-auth/pom.xml
@@ -183,7 +183,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -210,7 +210,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-mvc-custom/pom.xml b/spring-security-mvc-custom/pom.xml
index 8678b91ec8..73e3ea9cee 100644
--- a/spring-security-mvc-custom/pom.xml
+++ b/spring-security-mvc-custom/pom.xml
@@ -187,7 +187,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -214,7 +214,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-mvc-digest-auth/pom.xml b/spring-security-mvc-digest-auth/pom.xml
index 9cb06978f6..300825ca44 100644
--- a/spring-security-mvc-digest-auth/pom.xml
+++ b/spring-security-mvc-digest-auth/pom.xml
@@ -183,7 +183,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -210,7 +210,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-mvc-login/pom.xml b/spring-security-mvc-login/pom.xml
index 7504e33c76..1b788afa41 100644
--- a/spring-security-mvc-login/pom.xml
+++ b/spring-security-mvc-login/pom.xml
@@ -179,7 +179,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -206,7 +206,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-mvc-session/pom.xml b/spring-security-mvc-session/pom.xml
index 65df553ddf..a04a7f0da4 100644
--- a/spring-security-mvc-session/pom.xml
+++ b/spring-security-mvc-session/pom.xml
@@ -187,7 +187,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -214,7 +214,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-rest-basic-auth/pom.xml b/spring-security-rest-basic-auth/pom.xml
index 8cf15f6562..0ee8056b05 100644
--- a/spring-security-rest-basic-auth/pom.xml
+++ b/spring-security-rest-basic-auth/pom.xml
@@ -284,7 +284,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- http -->
@@ -312,7 +312,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-rest-custom/pom.xml b/spring-security-rest-custom/pom.xml
index b3bf977745..880fb314e7 100644
--- a/spring-security-rest-custom/pom.xml
+++ b/spring-security-rest-custom/pom.xml
@@ -239,7 +239,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- logging -->
@@ -266,7 +266,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-rest-digest-auth/pom.xml b/spring-security-rest-digest-auth/pom.xml
index 5b8cc88dc7..1c472b6016 100644
--- a/spring-security-rest-digest-auth/pom.xml
+++ b/spring-security-rest-digest-auth/pom.xml
@@ -272,7 +272,7 @@
         <org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
         <!-- persistence -->
-        <hibernate.version>4.2.3.Final</hibernate.version>
+        <hibernate.version>4.2.4.Final</hibernate.version>
         <mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
         <!-- http -->
@@ -300,7 +300,7 @@
 
         <!-- Maven plugins -->
         <cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-        <maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-rest-full/pom.xml b/spring-security-rest-full/pom.xml
index 1072e76c72..1d3368c456 100644
--- a/spring-security-rest-full/pom.xml
+++ b/spring-security-rest-full/pom.xml
@@ -92,7 +92,7 @@
 		<dependency>
 			<groupId>org.javassist</groupId>
 			<artifactId>javassist</artifactId>
-			<version>3.17.1-GA</version>
+			<version>3.18.0-GA</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
@@ -220,7 +220,7 @@
 		<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
-		<hibernate.version>4.2.3.Final</hibernate.version>
+		<hibernate.version>4.2.4.Final</hibernate.version>
 		<mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 		<spring-data-jpa.version>1.3.2.RELEASE</spring-data-jpa.version>
 
@@ -252,7 +252,7 @@
 
 		<!-- Maven plugins -->
 		<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-		<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 	</properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-security-rest/pom.xml b/spring-security-rest/pom.xml
index b6962abd24..3a2b884cb7 100644
--- a/spring-security-rest/pom.xml
+++ b/spring-security-rest/pom.xml
@@ -196,7 +196,7 @@
 		<org.springframework.security.version>3.1.4.RELEASE</org.springframework.security.version>
 
 		<!-- persistence -->
-		<hibernate.version>4.2.3.Final</hibernate.version>
+		<hibernate.version>4.2.4.Final</hibernate.version>
 		<mysql-connector-java.version>5.1.26</mysql-connector-java.version>
 
 		<!-- logging -->
@@ -223,7 +223,7 @@
 
 		<!-- Maven plugins -->
 		<cargo-maven2-plugin.version>1.4.3</cargo-maven2-plugin.version>
-		<maven-surefire-plugin.version>2.15</maven-surefire-plugin.version>
+		<maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
 	</properties>
 
 </project>
\ No newline at end of file