Upgrade to Spring Boot 1.2.0.RELEASE

* Spring Boot 1.2.0.RELEASE
* Spring Framework 4.1.3.RELEASE
* Undertow 1.1.1.Final

frameworks/Java/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.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/)
+* [Spring 4.1.3.RELEASE](http://projects.spring.io/spring-framework/)
+* [Spring Boot 1.2.0.RELEASE](http://projects.spring.io/spring-boot/)
+* [Spring Data JPA 1.7.1.RELEASE](http://projects.spring.io/spring-data-jpa/)
 * [Java OpenJDK 1.7.0_09](http://openjdk.java.net/)
-* [Tomcat 8.0.8](https://tomcat.apache.org/)
+* [Undertow 1.1.1.Final](http://undertow.io/)

frameworks/Java/spring/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.1.3.RELEASE</version>
+        <version>1.2.0.RELEASE</version>
     </parent>
 
     <groupId>com.techempower</groupId>
@@ -19,7 +19,6 @@
 
     <properties>
         <java.version>1.7</java.version>
-        <tomcat.version>8.0.9</tomcat.version>
     </properties>
 
     <dependencies>
@@ -39,20 +38,20 @@
         <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>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
         	<groupId>org.springframework.boot</groupId>
-        	<artifactId>spring-boot-starter-tomcat</artifactId>
+        	<artifactId>spring-boot-starter-undertow</artifactId>
         </dependency>
         <dependency>
             <groupId>org.thymeleaf</groupId>
@@ -74,8 +73,7 @@
         <repository>
             <id>bintray</id>
             <name>bintray</name>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </repository>
     </repositories>
-
 </project>

frameworks/Java/spring/src/main/java/com/techempower/spring/TomcatCustomizer.java

@@ -1,57 +0,0 @@
-package com.techempower.spring;
-
-import org.apache.catalina.connector.Connector;
-import org.apache.coyote.AbstractProtocol;
-import org.apache.coyote.ProtocolHandler;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
-import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.boot.context.embedded.tomcat.TomcatConnectorCustomizer;
-import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class TomcatCustomizer implements EmbeddedServletContainerCustomizer {
-
-	@Value("${tomcat.connector.maxThreads}")
-	private int maxThreads;
-
-	@Value("${tomcat.connector.connectionTimeout}")
-	private int connectionTimeout;
-
-	@Value("${tomcat.connector.maxConnections}")
-	private int maxConnections;
-
-    @Value("${tomcat.connector.acceptCount}")
-    private int acceptCount;
-
-	@Value("${tomcat.connector.maxKeepAliveRequests}")
-	private int maxKeepAliveRequests;
-
-	@Override
-	public void customize(ConfigurableEmbeddedServletContainer factory) {
-
-		customizeTomcatConnector((TomcatEmbeddedServletContainerFactory) factory);
-	}
-
-	private void customizeTomcatConnector(TomcatEmbeddedServletContainerFactory factory) {
-
-		factory.addConnectorCustomizers(
-				new TomcatConnectorCustomizer() {
-
-					@Override
-					public void customize(Connector connector) {
-						ProtocolHandler handler = connector.getProtocolHandler();
-						if (handler instanceof AbstractProtocol) {
-							AbstractProtocol protocol = (AbstractProtocol) handler;
-							protocol.setMaxThreads(maxThreads);
-							protocol.setConnectionTimeout(connectionTimeout);
-							protocol.setMaxConnections(maxConnections);
-						}
-						connector.setProperty("acceptCount", acceptCount+"");
-						connector.setProperty("maxKeepAliveRequests", maxKeepAliveRequests+"");
-					}
-				}
-		);
-	}
-}

frameworks/Java/spring/src/main/resources/application.yml

@@ -13,22 +13,6 @@ spring:
       ddl-auto: validate
     open_in_view: false
 
-tomcat:
-  connector:
-    # reduce context switching; Intel Xeons have 12 threads
-    maxThreads: 12
-    connectionTimeout: 20000
-    # maximum: 16K connections test
-    maxConnections: 20000
-    # handle initial connection spike
-    acceptCount: 20000
-    # avoid running out of ports due to connections stuck in TIME_WAIT state
-    maxKeepAliveRequests: -1
-
-server:
-  tomcat:
-    access_log_enabled: false
-
 ---
 spring:
   profiles: local