Updated Tomcat to latest version across the SDK

Author: dogeared

examples/servlet/pom.xml

@@ -116,10 +116,10 @@
                 <configuration>
                     <skip>${skipITs}</skip>
                     <container>
-                        <containerId>tomcat7x</containerId>
+                        <containerId>tomcat8x</containerId>
                         <zipUrlInstaller>
                             <url>
-                                http://repo1.maven.org/maven2/org/apache/tomcat/tomcat/7.0.69/tomcat-7.0.69.zip
+                                http://repo1.maven.org/maven2/org/apache/tomcat/tomcat/8.5.9/tomcat-8.5.9.zip
                             </url>
                         </zipUrlInstaller>
                     </container>

examples/spring-security-spring-boot-webmvc-bare-bones/pom.xml

@@ -38,7 +38,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.21</slf4j.version>
         <spring.boot.version>1.4.0.RELEASE</spring.boot.version>
-        <tomcat.version>7.0.59</tomcat.version>
+        <tomcat.version>8.5.9</tomcat.version>
     </properties>
 
     <dependencies>

examples/spring-security-spring-boot-webmvc/pom.xml

@@ -39,7 +39,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.21</slf4j.version>
         <spring.boot.version>1.4.0.RELEASE</spring.boot.version>
-        <tomcat.version>7.0.59</tomcat.version>
+        <tomcat.version>8.5.9</tomcat.version>
     </properties>
 
     <dependencies>

examples/spring-security-webmvc/pom.xml

@@ -41,7 +41,7 @@
         <slf4j.version>1.7.21</slf4j.version>
         <spring.version>4.3.2.RELEASE</spring.version>
         <spring.security.version>4.1.2.RELEASE</spring.security.version>
-        <tomcat.version>7.0.59</tomcat.version>
+        <tomcat.version>8.5.9</tomcat.version>
     </properties>
 
     <dependencies>

extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/pom.xml

@@ -27,10 +27,6 @@
     <name>Stormpath :: Spring :: Boot :: Spring Security :: Web MVC Starter</name>
     <description>Spring Boot WebMVC Starter for Stormpath with Spring Security</description>
 
-    <properties>
-        <tomcat.version>8.5.0</tomcat.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
@@ -58,24 +54,6 @@
             <artifactId>stormpath-sdk-httpclient</artifactId>
             <scope>runtime</scope>
         </dependency>
-
-        <!--
-            We need to force Tomcat 7 for the ITs to run in Java 6.
-            Otherwise Tomcat 8.0.15 is used and it throws:
-            javax/servlet/ServletContext : Unsupported major.minor version 51.0
-        -->
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${tomcat.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-el</artifactId>
-            <version>${tomcat.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.stormpath.spring</groupId>
             <artifactId>stormpath-spring</artifactId>

extensions/spring/boot/stormpath-webmvc-spring-boot-starter/pom.xml

@@ -27,10 +27,6 @@
     <name>Stormpath :: Spring :: Boot :: Web MVC</name>
     <description>Stormpath WebMVC Spring Boot Starter</description>
 
-    <properties>
-        <tomcat.version>7.0.59</tomcat.version>
-    </properties>
-
     <dependencies>
 
         <dependency>
@@ -75,23 +71,6 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
-        <!--
-            We need to force Tomcat 7 for the ITs to run in Java 6.
-            Otherwise Tomcat 8.0.15 is used and it throws:
-            javax/servlet/ServletContext : Unsupported major.minor version 51.0
-        -->
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${tomcat.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-el</artifactId>
-            <version>${tomcat.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.stormpath.spring</groupId>
             <artifactId>stormpath-spring</artifactId>