Merge branch 'boot-upgrade' of http://github.com/bclozel/FrameworkBenchmarks into 889

spring/README.md

@@ -61,8 +61,8 @@ Check out [SampleApplication, the main Application file](src/main/java/com/teche
 ## Infrastructure Software Versions
 The tests were run with:
 
-* [Spring 4.0.2.RELEASE](http://projects.spring.io/spring-framework/)
-* [Spring Boot 1.0.0.RC4](http://projects.spring.io/spring-boot/)
-* [Spring Data JPA 1.5.0.RELEASE](http://projects.spring.io/spring-data-jpa/)
+* [Spring 4.0.5.RELEASE](http://projects.spring.io/spring-framework/)
+* [Spring Boot 1.1.3.RELEASE](http://projects.spring.io/spring-boot/)
+* [Spring Data JPA 1.6.0.RELEASE](http://projects.spring.io/spring-data-jpa/)
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
-* [Tomcat 8.0.3](https://tomcat.apache.org/)
+* [Tomcat 8.0.8](https://tomcat.apache.org/)

spring/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.0.0.RC4</version>
+        <version>1.1.3.RELEASE</version>
     </parent>
 
     <groupId>com.techempower</groupId>
@@ -19,7 +19,7 @@
 
     <properties>
         <java.version>1.7</java.version>
-        <tomcat.version>8.0.3</tomcat.version>
+        <tomcat.version>8.0.9</tomcat.version>
     </properties>
 
     <dependencies>
@@ -32,9 +32,19 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-jdbc</artifactId>
+				</exclusion>
+			</exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -43,16 +53,11 @@
         <dependency>
         	<groupId>org.springframework.boot</groupId>
         	<artifactId>spring-boot-starter-tomcat</artifactId>
-        	<scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
             <artifactId>thymeleaf-spring4</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
@@ -66,10 +71,6 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <url>http://repo.spring.io/milestone</url>
-        </repository>
         <repository>
             <id>bintray</id>
             <name>bintray</name>
@@ -77,11 +78,4 @@
         </repository>
     </repositories>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <url>http://repo.spring.io/milestone</url>
-        </pluginRepository>
-    </pluginRepositories>
-
 </project>

spring/src/main/java/com/techempower/spring/web/FortuneController.java

@@ -19,7 +19,7 @@ final class FortuneController {
     private FortuneRepository fortuneRepository;
 
     @RequestMapping(value = "/fortunes")
-     String fortunes(ModelMap modelMap) {
+    String fortunes(ModelMap modelMap) {
         List<Fortune> fortunes = this.fortuneRepository.findAll();
         fortunes.add(new Fortune(0, "Additional fortune added at request time."));
         Collections.sort(fortunes);

spring/src/main/java/com/techempower/spring/web/WorldDatabaseController.java

@@ -58,7 +58,7 @@ final class WorldDatabaseController {
 		return worlds;
 	}
 
-	private Integer boundQueryCount(Integer raw) {
+	private Integer boundQueryCount(final Integer raw) {
 		if (raw == null || raw < 1) {
 			return 1;
 		} else if (raw > 500) {

spring/src/main/resources/application.yml

@@ -6,8 +6,6 @@ spring:
     url: jdbc:mysql://${database.host:localhost}:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true
     username: benchmarkdbuser
     password: benchmarkdbpass
-    maxActive: 256
-    maxIdle: 256    
   jpa:
     show_sql: false
     hibernate:

spring/src/main/resources/schema.sql → spring/src/main/resources/import.sql

@@ -1,7 +1,3 @@
-
-
--- Uncomment the following lines to import sample data
-
 -- Fortunes
 insert into Fortune(message) values ('43rd Law of Computing: Anything that can go wr fortune: Segmentation violation -- Core dumped');
 insert into Fortune(message) values ('The proof of the pudding is in the eating. -- Miguel de Cervantes');