Browse Source

Update to Tomcat 9

Spring recently updated to require Servlet 4, so update to Tomcat 9.

Closes gh-6
Rob Winch 4 years ago
parent
commit
c2bee61c34
26 changed files with 12 additions and 25 deletions
  1. 0 1
      servlet/java-configuration/aspectj/gradle.properties
  2. 1 1
      servlet/java-configuration/aspectj/gradle/gretty.gradle
  3. 0 1
      servlet/java-configuration/authentication/preauth/gradle.properties
  4. 1 1
      servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
  5. 0 0
      servlet/java-configuration/authentication/preauth/server/tomcat-users.xml
  6. 0 1
      servlet/java-configuration/authentication/remember-me/gradle.properties
  7. 1 1
      servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle
  8. 0 1
      servlet/java-configuration/authentication/username-password/form/gradle.properties
  9. 1 1
      servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle
  10. 0 1
      servlet/java-configuration/authentication/username-password/in-memory/gradle.properties
  11. 1 1
      servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle
  12. 0 1
      servlet/java-configuration/authentication/username-password/jdbc/gradle.properties
  13. 1 1
      servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle
  14. 0 1
      servlet/java-configuration/authentication/username-password/ldap/gradle.properties
  15. 1 1
      servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle
  16. 0 1
      servlet/java-configuration/authentication/x509/gradle.properties
  17. 1 1
      servlet/java-configuration/authentication/x509/gradle/gretty.gradle
  18. 0 1
      servlet/java-configuration/data/gradle.properties
  19. 0 1
      servlet/java-configuration/hello-mvc-security/gradle.properties
  20. 1 1
      servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle
  21. 0 1
      servlet/java-configuration/hello-security-explicit/gradle.properties
  22. 1 1
      servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle
  23. 0 1
      servlet/java-configuration/hello-security/gradle.properties
  24. 1 1
      servlet/java-configuration/hello-security/gradle/gretty.gradle
  25. 0 1
      servlet/java-configuration/max-sessions/gradle.properties
  26. 1 1
      servlet/java-configuration/max-sessions/gradle/gretty.gradle

+ 0 - 1
servlet/java-configuration/aspectj/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/aspectj/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/authentication/preauth/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/authentication/preauth/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 0
servlet/java-configuration/authentication/preauth/server/tomcat85-users.xml → servlet/java-configuration/authentication/preauth/server/tomcat-users.xml


+ 0 - 1
servlet/java-configuration/authentication/remember-me/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/authentication/username-password/form/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/authentication/username-password/in-memory/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/authentication/username-password/jdbc/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/authentication/username-password/ldap/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/authentication/x509/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/authentication/x509/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/data/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 0 - 1
servlet/java-configuration/hello-mvc-security/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/hello-security-explicit/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/hello-security/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/hello-security/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'

+ 0 - 1
servlet/java-configuration/max-sessions/gradle.properties

@@ -1 +0,0 @@
-tomcat85Version=8.5.54

+ 1 - 1
servlet/java-configuration/max-sessions/gradle/gretty.gradle

@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'