From 34ed901645f8e707a14ef393ab5ef6cd471055fa Mon Sep 17 00:00:00 2001
From: DOHA <dohae243@gmail.com>
Date: Wed, 7 Dec 2016 15:12:41 +0200
Subject: [PATCH] upgrade dependencies

---
 spring-exceptions/pom.xml                     | 44 ++++++++++---------
 .../Cause4MappingExceptionManualTest.java     |  4 +-
 spring-freemarker/pom.xml                     |  9 ++--
 spring-hibernate3/pom.xml                     | 28 ++++++------
 4 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index 6994a518fe..a8254151aa 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.0.1</version>
+            <version>${javax.servlet-api.version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -133,28 +133,28 @@
         <dependency>
         	<groupId>javax.el</groupId>
         	<artifactId>el-api</artifactId>
-        	<version>2.2</version>
+        	<version>${javax.el.version}</version>
         </dependency>
 
         <dependency>
         	<groupId>org.apache.derby</groupId>
         	<artifactId>derby</artifactId>
-        	<version>10.12.1.1</version>
+        	<version>${derby.version}</version>
         </dependency>
         <dependency>
         	<groupId>org.apache.derby</groupId>
         	<artifactId>derbyclient</artifactId>
-        	<version>10.12.1.1</version>
+        	<version>${derby.version}</version>
         </dependency>
         <dependency>
         	<groupId>org.apache.derby</groupId>
         	<artifactId>derbynet</artifactId>
-        	<version>10.12.1.1</version>
+        	<version>${derby.version}</version>
         </dependency>
         <dependency>
         	<groupId>org.apache.derby</groupId>
         	<artifactId>derbytools</artifactId>
-        	<version>10.12.1.1</version>
+        	<version>${derby.version}</version>
         </dependency>
     </dependencies>
 
@@ -208,44 +208,46 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.3.2.RELEASE</org.springframework.version>
-        <org.springframework.security.version>4.1.1.RELEASE</org.springframework.security.version>
-        <javassist.version>3.20.0-GA</javassist.version>
+        <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
+        <org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
+        <javassist.version>3.21.0-GA</javassist.version>
         <jstl.version>1.2</jstl.version>
 
         <!-- persistence -->
-        <hibernate.version>4.3.11.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
-        <tomcat-dbcp.version>7.0.42</tomcat-dbcp.version>
+        <hibernate.version>5.2.5.Final</hibernate.version>
+        <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
+        <tomcat-dbcp.version>7.0.73</tomcat-dbcp.version>
+        <derby.version>10.13.1.1</derby.version>
 
         <!-- logging -->
-        <org.slf4j.version>1.7.13</org.slf4j.version>
-        <logback.version>1.1.3</logback.version>
+        <org.slf4j.version>1.7.21</org.slf4j.version>
+        <logback.version>1.1.7</logback.version>
 
         <!-- various -->
-        <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
+        <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
+        <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
+        <javax.el.version>2.2</javax.el.version>
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.4</commons-lang3.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- testing -->
         <org.hamcrest.version>1.3</org.hamcrest.version>
         <junit.version>4.12</junit.version>
         <mockito.version>1.10.19</mockito.version>
 
-        <httpcore.version>4.4.1</httpcore.version>
-        <httpclient.version>4.5</httpclient.version>
+        <httpcore.version>4.4.5</httpcore.version>
+        <httpclient.version>4.5.2</httpclient.version>
 
         <rest-assured.version>2.9.0</rest-assured.version>
-        <groovy.version>1.8.9</groovy.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <maven-war-plugin.version>2.6</maven-war-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 
     </properties>
 
diff --git a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
index 760d082f54..ea90b3d6cc 100644
--- a/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
+++ b/spring-exceptions/src/test/java/org/baeldung/ex/mappingexception/Cause4MappingExceptionManualTest.java
@@ -7,9 +7,9 @@ import java.util.Properties;
 import org.baeldung.ex.mappingexception.cause4.persistence.model.Foo;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.service.ServiceRegistryBuilder;
 import org.junit.Test;
 
 public class Cause4MappingExceptionManualTest {
@@ -35,7 +35,7 @@ public class Cause4MappingExceptionManualTest {
 
         configuration.addAnnotatedClass(Foo.class);
 
-        final ServiceRegistry serviceRegistry = new ServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
+        final ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
         final SessionFactory sessionFactory = configuration.buildSessionFactory(serviceRegistry);
         return sessionFactory;
     }
diff --git a/spring-freemarker/pom.xml b/spring-freemarker/pom.xml
index 51df4e6647..7e61a3f081 100644
--- a/spring-freemarker/pom.xml
+++ b/spring-freemarker/pom.xml
@@ -9,12 +9,13 @@
 
 	<properties>
 		<jdk.version>1.8</jdk.version>
-		<spring.version>4.2.4.RELEASE</spring.version>
+		<spring.version>4.3.4.RELEASE</spring.version>
 		<freemarker.version>2.3.23</freemarker.version>
-		<logback.version>1.1.3</logback.version>
-		<jcl.slf4j.version>1.7.12</jcl.slf4j.version>
+		<logback.version>1.1.7</logback.version>
+		<jcl.slf4j.version>1.7.21</jcl.slf4j.version>
 		<servletapi.version>3.1.0</servletapi.version>
 		<failOnMissingWebXml>false</failOnMissingWebXml>
+		<maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
 	</properties>
 
 	<dependencies>
@@ -73,7 +74,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.3</version>
+				<version>${maven-compiler-plugin.version}</version>
 				<configuration>
 					<source>${jdk.version}</source>
 					<target>${jdk.version}</target>
diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml
index 9f99d83a42..f7b198a2b1 100644
--- a/spring-hibernate3/pom.xml
+++ b/spring-hibernate3/pom.xml
@@ -181,42 +181,42 @@
     
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.2.5.RELEASE</org.springframework.version>
-        <org.springframework.security.version>4.0.4.RELEASE</org.springframework.security.version>
-        <javassist.version>3.20.0-GA</javassist.version>
+        <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
+        <org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
+        <javassist.version>3.21.0-GA</javassist.version>
 
         <!-- persistence -->
         <hibernate.version>3.6.10.Final</hibernate.version>
-        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
-        <tomcat-dbcp.version>7.0.47</tomcat-dbcp.version>
-        <h2.version>1.4.191</h2.version>
+        <mysql-connector-java.version>5.1.40</mysql-connector-java.version>
+        <tomcat-dbcp.version>7.0.73</tomcat-dbcp.version>
+        <h2.version>1.4.193</h2.version>
 
         <!-- logging -->
-        <org.slf4j.version>1.7.13</org.slf4j.version>
-        <logback.version>1.1.3</logback.version>
+        <org.slf4j.version>1.7.21</org.slf4j.version>
+        <logback.version>1.1.7</logback.version>
 
         <!-- various -->
-        <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
+        <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
 
         <!-- util -->
         <guava.version>19.0</guava.version>
-        <commons-lang3.version>3.4</commons-lang3.version>
+        <commons-lang3.version>3.5</commons-lang3.version>
 
         <!-- testing -->
         <org.hamcrest.version>1.3</org.hamcrest.version>
         <junit.version>4.12</junit.version>
         <mockito.version>1.10.19</mockito.version>
 
-        <httpcore.version>4.4.1</httpcore.version>
-        <httpclient.version>4.5</httpclient.version>
+        <httpcore.version>4.4.5</httpcore.version>
+        <httpclient.version>4.5.2</httpclient.version>
 
         <rest-assured.version>2.9.0</rest-assured.version>
 
         <!-- maven plugins -->
-        <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
         <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
-        <cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
+        <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
 
     </properties>