vraptor-scaffold 1.3.0.rc → 1.3.0

data/spec/vraptor-scaffold/generators/app/jsp_template_engine_spec.rb

@@ -8,6 +8,9 @@ describe JspTemplateEngine do
       @web_inf = "#{@project_path}/#{Configuration::WEB_INF}"
       @decorators = "#{@web_inf}/jsp/decorators"
       @app = "#{@project_path}/#{Configuration::MAIN_SRC}/app"
+
+      mock_http_request()
+
       AppGenerator.new(@project_path).invoke_all
     end
 
@@ -22,34 +25,73 @@ describe JspTemplateEngine do
     end
 
     it "should create views folder" do
-      File.exist?("#{@web_inf}/jsp").should be_true 
+      File.exist?("#{@web_inf}/jsp").should be_true
     end
 
     it "should create decorator file" do
-      source = "#{JspTemplateEngine.source_root}/main.jsp"
-      destination = "#{@decorators}/main.jsp"
-      exists_and_identical?(source, destination)
+      File.exists?("#{@decorators}/main.jsp").should be_true
     end
 
     it "should not create infrastructure folder" do
-      File.exist?("#{@app}/infrastructure").should be_false 
+      File.exist?("#{@app}/infrastructure").should be_false
     end
 
     it "should not create path resolver" do
       to = "#{@app}/infrastructure/FreemarkerPathResolver.java"
       File.exist?(to).should be_false
     end
-    
+
     it "should create web.xml" do
       source = File.join File.dirname(__FILE__), "templates", "jsp-web.xml"
       destination = "#{@web_inf}/web.xml"
       exists_and_identical?(source, destination)
     end
-    
+
     it "should create prelude.jspf" do
       source = "#{JspTemplateEngine.source_root}/prelude.jspf"
       destination = "#{@web_inf}/jsp/prelude.jspf"
       exists_and_identical?(source, destination)
     end
   end
+
+  context "building a jsp application with jquery" do
+    before(:all) do
+      @project_path = "src/vraptor-scaffold-with-jquery"
+      @web_inf = "#{@project_path}/#{Configuration::WEB_INF}"
+      @decorators = "#{@web_inf}/jsp/decorators"
+
+      mock_http_request()
+
+      AppGenerator.new(@project_path).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir("src/vraptor-scaffold-with-jquery")
+    end
+
+    it "should create a main file with jquery js import" do
+      source = File.join File.dirname(__FILE__), "templates", "main-with-jquery.jsp"
+      destination = "#{@decorators}/main.jsp"
+      exists_and_identical?(source, destination)
+    end
+  end
+
+  context "building a jsp application without jquery" do
+    before(:all) do
+      @project_path = "src/vraptor-scaffold-without-jquery"
+      @web_inf = "#{@project_path}/#{Configuration::WEB_INF}"
+      @decorators = "#{@web_inf}/jsp/decorators"
+      AppGenerator.new(@project_path, ["--skip-jquery"]).invoke_all
+    end
+
+    after(:all) do
+      FileUtils.remove_dir("src/vraptor-scaffold-without-jquery")
+    end
+
+    it "should create a main file with jquery js import" do
+      source = File.join File.dirname(__FILE__), "templates", "main-without-jquery.jsp"
+      destination = "#{@decorators}/main.jsp"
+      exists_and_identical?(source, destination)
+    end
+  end
 end

data/spec/vraptor-scaffold/generators/app/templates/build.gradle

@@ -34,17 +34,17 @@ sourceSets {
 sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 
 dependencies {
-    compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.0'
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.1'
     compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
     compile group: 'javax.servlet', name: 'jstl', version: '1.2'
-    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
-    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.6.7.Final'
-    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
+    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.8'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.0.1.Final'
+    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '4.0.1.Final'
     compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
     compile group: 'joda-time', name: 'joda-time', version: '2.0'
     compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.1'
@@ -56,5 +56,5 @@ dependencies {
     //Test dependencies
     testCompile group: 'junit', name: 'junit', version: '4.10'
     testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.0'
 }

data/spec/vraptor-scaffold/generators/app/templates/classpath-gae

@@ -2,8 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	
@@ -11,7 +9,7 @@
         
 	  <classpathentry kind="lib" path="lib/test/hamcrest-all-1.1.jar"/>
         
-	  <classpathentry kind="lib" path="lib/test/mockito-all-1.8.5.jar"/>
+	  <classpathentry kind="lib" path="lib/test/mockito-all-1.9.0.jar"/>
         	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="com.google.appengine.eclipse.core.GAE_CONTAINER"/>
 	<classpathentry kind="output" path="src/main/webapp/WEB-INF/classes"/>

data/spec/vraptor-scaffold/generators/app/templates/gae-jsp-web.xml

@@ -7,7 +7,7 @@
 
 	<context-param>
 		<param-name>br.com.caelum.vraptor.packages</param-name>
-		<param-value>br.com.caelum.vraptor.util.gae</param-value>
+		<param-value>br.com.caelum.vraptor.gae</param-value>
 	</context-param>
 
 	<context-param>

data/spec/vraptor-scaffold/generators/app/templates/ivy-gae.xml

@@ -10,18 +10,20 @@
 	</configurations>
 
 	<dependencies>
-		<dependency org="br.com.caelum" name="vraptor" rev="3.3.1" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor" rev="3.4.1" conf="default">
+			<exclude org="org.objenesis" name="objenesis" />
+		</dependency>
 		<dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
 		<dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
 		<dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
 		<dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
 		<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
 		<dependency org="com.googlecode.objectify" name="objectify" rev="3.1" conf="default" />
-		<dependency org="br.com.caelum" name="vraptor-gae" rev="1.0" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor3.4-compatible-gae" rev="1.1" conf="default" />
 		<dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.2" conf="default" />
-		<dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.6.0" conf="default" />
-		<dependency org="com.google.appengine" name="appengine-api-labs" rev="1.6.0" conf="default" />
-		<dependency org="com.google.appengine" name="appengine-jsr107cache" rev="1.6.0" conf="default" />
+		<dependency org="com.google.appengine" name="appengine-api-1.0-sdk" rev="1.7.2.1" conf="default" />
+		<dependency org="com.google.appengine" name="appengine-api-labs" rev="1.7.2.1" conf="default" />
+		<dependency org="com.google.appengine" name="appengine-jsr107cache" rev="1.7.2.1" conf="default" />
 		<dependency org="net.sf.jsr107cache" name="jsr107cache" rev="1.1" conf="default" />
 		<dependency org="org.apache.geronimo.specs" name="geronimo-jpa_3.0_spec" rev="1.1.1" conf="default" />
 
@@ -32,7 +34,7 @@
 		<!-- Test dependencies -->
 		<dependency org="junit" name="junit" rev="4.10" conf="test->default" />
 		<dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
-		<dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
+		<dependency org="org.mockito" name="mockito-all" rev="1.9.0" conf="test->default" />
 
 		<!-- Jetty dependencies -->
 		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default" />

data/spec/vraptor-scaffold/generators/app/templates/ivy.xml

@@ -10,12 +10,12 @@
 	</configurations>
 
 	<dependencies>
-		<dependency org="br.com.caelum" name="vraptor" rev="3.4.0" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor" rev="3.4.1" conf="default" />
 		<dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
 		<dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
-		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.4" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.6.7.Final" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-c3p0" rev="3.6.7.Final" conf="default" />
+		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.8" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="4.0.1.Final" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-c3p0" rev="4.0.1.Final" conf="default" />
 		<dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
 		<dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
 		<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
@@ -27,7 +27,7 @@
 		<!-- Test dependencies -->
 		<dependency org="junit" name="junit" rev="4.10" conf="test->default" />
 		<dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
-		<dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
+		<dependency org="org.mockito" name="mockito-all" rev="1.9.0" conf="test->default" />
 
 		<!-- Jetty dependencies -->
 		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default" />

data/spec/vraptor-scaffold/generators/app/templates/main-without-jquery.ftl

@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <@html.css "application"/>
+    <title>Vraptor Scaffold</title>
+    ${head}
+  </head>
+
+  <body>
+    ${body}
+    <@html.js "application"/>
+  </body>
+</html>

data/spec/vraptor-scaffold/generators/app/templates/main-without-jquery.jsp

@@ -0,0 +1,16 @@
+<%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title><decorator:title default="Vraptor Scaffold"/></title>
+    <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/stylesheets/application.css"/>
+    <decorator:head/>
+  </head>
+  <body>
+    <decorator:body/>
+    <script type="text/javascript" src="${pageContext.request.contextPath}/javascripts/application.js"></script>
+  </body>
+</html>

data/spec/vraptor-scaffold/generators/app/templates/pom-heroku.xml

@@ -79,7 +79,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.4.0</version>
+			<version>3.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
@@ -94,17 +94,17 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.2.4</version>
+			<version>2.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-c3p0</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -153,7 +153,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.8.5</version>
+			<version>1.9.0</version>
 			<scope>test</scope>
 		</dependency>
 

data/spec/vraptor-scaffold/generators/app/templates/pom.xml

@@ -57,7 +57,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.4.0</version>
+			<version>3.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
@@ -72,17 +72,17 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.2.4</version>
+			<version>2.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-c3p0</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -116,7 +116,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.8.5</version>
+			<version>1.9.0</version>
 			<scope>test</scope>
 		</dependency>
 

data/spec/vraptor-scaffold/generators/app/templates/project-gae

@@ -26,12 +26,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.google.appengine.eclipse.core.enhancerbuilder</name>
+			<name>com.google.appengine.eclipse.core.projectValidator</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.google.appengine.eclipse.core.projectValidator</name>
+			<name>com.google.appengine.eclipse.core.enhancerbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>

data/spec/vraptor-scaffold/generators/app/templates/vraptor-scaffold-gae.properties

@@ -0,0 +1,7 @@
+build_tool: ant
+package: app
+template_engine: jsp
+orm: objectify
+models_package: domain
+controllers_package: control
+repositories_package: repository

data/spec/vraptor-scaffold/generators/plugin/expected_configs/build.gradle

@@ -34,19 +34,19 @@ sourceSets {
 sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 
 dependencies {
-    compile group: 'br.com.caelum.vraptor.plugin', name: 'vraptor-environment', version: '0.0.8'
+    compile group: 'br.com.caelum.vraptor', name: 'vraptor-environment', version: '0.0.8'
 
-    compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.0'
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.1'
     compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
     compile group: 'javax.servlet', name: 'jstl', version: '1.2'
-    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
-    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.6.7.Final'
-    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
+    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.8'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.0.1.Final'
+    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '4.0.1.Final'
     compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
     compile group: 'joda-time', name: 'joda-time', version: '2.0'
     compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.1'
@@ -58,5 +58,5 @@ dependencies {
     //Test dependencies
     testCompile group: 'junit', name: 'junit', version: '4.10'
     testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.0'
 }

data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_build.gradle

@@ -34,19 +34,19 @@ sourceSets {
 sourceSets.main.classesDir = new File('src/main/webapp/WEB-INF/classes')
 
 jettyRun.scanIntervalSeconds=3
-jettyRun.contextPath = '/' 
+jettyRun.contextPath = '/'
 [jettyRunWar,jettyStop]*.stopPort = 8081
 [jettyRunWar,jettyStop]*.stopKey = 'stopKey'
 
 dependencies {
     compile group: 'br.com.caelum.vraptor', name: 'vraptor-environment', version: '0.0.8'
 
-    compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.0'
+    compile group: 'br.com.caelum', name: 'vraptor', version: '3.4.1'
     compile group: 'opensymphony', name: 'sitemesh', version: '2.4.2'
     compile group: 'javax.servlet', name: 'jstl', version: '1.2'
-    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.4'
-    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '3.6.7.Final'
-    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '3.6.7.Final'
+    compile group: 'org.hsqldb', name: 'hsqldb', version: '2.2.8'
+    compile group: 'org.hibernate', name: 'hibernate-entitymanager', version: '4.0.1.Final'
+    compile group: 'org.hibernate', name: 'hibernate-c3p0', version: '4.0.1.Final'
     compile group: 'org.hibernate', name: 'hibernate-validator', version: '4.2.0.Final'
     compile group: 'joda-time', name: 'joda-time', version: '2.0'
     compile group: 'com.thoughtworks.xstream', name: 'xstream', version: '1.4.1'
@@ -58,5 +58,5 @@ dependencies {
     //Test dependencies
     testCompile group: 'junit', name: 'junit', version: '4.10'
     testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.1'
-    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.8.5'
+    testCompile group: 'org.mockito', name: 'mockito-all', version: '1.9.0'
 }

data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_ivy.xml

@@ -11,12 +11,12 @@
 
 	<dependencies>
 		<dependency org="br.com.caelum.vraptor" name="vraptor-environment" rev="0.0.8" conf="default" />
-		<dependency org="br.com.caelum" name="vraptor" rev="3.4.0" conf="default" />
+		<dependency org="br.com.caelum" name="vraptor" rev="3.4.1" conf="default" />
 		<dependency org="opensymphony" name="sitemesh" rev="2.4.2" conf="default" />
 		<dependency org="javax.servlet" name="jstl" rev="1.2" conf="default" />
-		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.4" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.6.7.Final" conf="default" />
-		<dependency org="org.hibernate" name="hibernate-c3p0" rev="3.6.7.Final" conf="default" />
+		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.8" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="4.0.1.Final" conf="default" />
+		<dependency org="org.hibernate" name="hibernate-c3p0" rev="4.0.1.Final" conf="default" />
 		<dependency org="org.hibernate" name="hibernate-validator" rev="4.2.0.Final" conf="default" />
 		<dependency org="joda-time" name="joda-time" rev="2.0" conf="default" />
 		<dependency org="com.thoughtworks.xstream" name="xstream" rev="1.4.1" conf="default" />
@@ -28,7 +28,7 @@
 		<!-- Test dependencies -->
 		<dependency org="junit" name="junit" rev="4.10" conf="test->default" />
 		<dependency org="org.hamcrest" name="hamcrest-all" rev="1.1" conf="test->default" />
-		<dependency org="org.mockito" name="mockito-all" rev="1.8.5" conf="test->default" />
+		<dependency org="org.mockito" name="mockito-all" rev="1.9.0" conf="test->default" />
 
 		<!-- Jetty dependencies -->
 		<dependency org="org.mortbay.jetty" name="jsp-api-2.1" rev="6.1.14" conf="jetty->default" />

data/spec/vraptor-scaffold/generators/plugin/expected_configs/default_org_pom.xml

@@ -62,7 +62,7 @@
 		<dependency>
 			<groupId>br.com.caelum</groupId>
 			<artifactId>vraptor</artifactId>
-			<version>3.4.0</version>
+			<version>3.4.1</version>
 		</dependency>
 		<dependency>
 			<groupId>opensymphony</groupId>
@@ -77,17 +77,17 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.2.4</version>
+			<version>2.2.8</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-c3p0</artifactId>
-			<version>3.6.7.Final</version>
+			<version>4.0.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
@@ -121,7 +121,7 @@
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
-			<version>1.8.5</version>
+			<version>1.9.0</version>
 			<scope>test</scope>
 		</dependency>