diff --git a/pom.xml b/pom.xml
index f408f2d5a1802d4996952ec974a069d06b8842d8..e3e503dcf6396a18e134cc6cde91e59a54e3740b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,21 +61,27 @@
 		<show.deprecations>false</show.deprecations>
 		<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
 
-		<junit.version>4.11</junit.version>
-		<jsonpath.version>0.8.1</jsonpath.version>
+		<junit.version>4.12</junit.version>
 
-		<commons.beanutils.version>1.8.3</commons.beanutils.version>
+		<commons.beanutils.version>1.9.2</commons.beanutils.version>
 		<commons.collections.version>3.2.1</commons.collections.version>
-		<commons.fileupload.version>1.2.2</commons.fileupload.version>
+		<commons.fileupload.version>1.3.1</commons.fileupload.version>
 		<commons.io.version>2.4</commons.io.version>
 		<commons.lang.version>2.6</commons.lang.version>
-		<commons.logging.version>1.1.1</commons.logging.version>
+		<commons.logging.version>1.2</commons.logging.version>
 
 		<jstl.version>1.2</jstl.version>
 		<servlet-api.version>2.5</servlet-api.version>
 		<jsp-api.version>2.1</jsp-api.version>
 
-		<hibernate.version>4.3.6.Final</hibernate.version>
+		<spring.framework.version>4.2.5.RELEASE</spring.framework.version>
+		<spring.data.release-train>Hopper-SR1</spring.data.release-train>
+		<spring.security.version>4.0.4.RELEASE</spring.security.version>
+		<spring.security.oauth2.version>1.0.5.RELEASE</spring.security.oauth2.version>
+		<org.springframework.social-version>1.1.4.RELEASE</org.springframework.social-version>
+		<org.springframework.social-google-version>1.0.0.RELEASE</org.springframework.social-google-version>
+
+		<hibernate.version>4.3.11.Final</hibernate.version>
 		<hsqldb.version>2.3.3</hsqldb.version>
 		<ehcache.version>2.7.4</ehcache.version>
 
@@ -83,18 +89,13 @@
 		<log4j.version>1.2.17</log4j.version>
 
 		<aspectj.version>1.7.2</aspectj.version>
-		<spring.framework.version>4.2.1.RELEASE</spring.framework.version>
-		<spring.security.version>4.0.2.RELEASE</spring.security.version>
-		<spring.security.oauth2.version>1.0.5.RELEASE</spring.security.oauth2.version>
-		<org.springframework.social-version>1.1.2.RELEASE</org.springframework.social-version>
-		<org.springframework.social-google-version>1.0.0.RELEASE</org.springframework.social-google-version>
 
 		<mysql.version>5.1.31</mysql.version>
 		<hazelcast.version>3.4</hazelcast.version>
 
 		<oval.version>1.81</oval.version>
 		<jackson.version>2.2.1</jackson.version>
-		<jaxb-api.version>2.1</jaxb-api.version>
+		<jaxb-api.version>2.2.12</jaxb-api.version>
 
 		<!--Container -->
 		<jetty.version>9.3.6.v20151106</jetty.version>
@@ -341,7 +342,7 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.3</version>
+			<version>2.9.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -471,7 +472,7 @@
 		<dependency>
 			<groupId>org.genesys-pgr</groupId>
 			<artifactId>file-repository</artifactId>
-			<version>0.4-SNAPSHOT</version>
+			<version>0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -479,12 +480,6 @@
 			<version>2.0.2-beta</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.jayway.jsonpath</groupId>
-			<artifactId>json-path-assert</artifactId>
-			<version>0.8.1</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
diff --git a/src/main/resources/spring/spring.properties b/src/main/resources/spring/spring.properties
index 3214df7993cae4c038029c48482e814322b81595..ce16e8856ae4a3704bc507d15d7c58e34e80ea75 100644
--- a/src/main/resources/spring/spring.properties
+++ b/src/main/resources/spring/spring.properties
@@ -167,4 +167,5 @@ file.repository.dir=${download.files.dir}/repository
 s3.accessKey=
 s3.secretKey=
 s3.bucket=
+s3.prefix=
 s3.region=