From c2bee61c349f47c93b4f360b0a0de0ffe46b16d7 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Wed, 27 Jan 2021 21:58:02 -0600
Subject: [PATCH] Update to Tomcat 9

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

Closes gh-6
---
 servlet/java-configuration/aspectj/gradle.properties            | 1 -
 servlet/java-configuration/aspectj/gradle/gretty.gradle         | 2 +-
 .../java-configuration/authentication/preauth/gradle.properties | 1 -
 .../authentication/preauth/gradle/gretty.gradle                 | 2 +-
 .../preauth/server/{tomcat85-users.xml => tomcat-users.xml}     | 0
 .../authentication/remember-me/gradle.properties                | 1 -
 .../authentication/remember-me/gradle/gretty.gradle             | 2 +-
 .../authentication/username-password/form/gradle.properties     | 1 -
 .../authentication/username-password/form/gradle/gretty.gradle  | 2 +-
 .../username-password/in-memory/gradle.properties               | 1 -
 .../username-password/in-memory/gradle/gretty.gradle            | 2 +-
 .../authentication/username-password/jdbc/gradle.properties     | 1 -
 .../authentication/username-password/jdbc/gradle/gretty.gradle  | 2 +-
 .../authentication/username-password/ldap/gradle.properties     | 1 -
 .../authentication/username-password/ldap/gradle/gretty.gradle  | 2 +-
 .../java-configuration/authentication/x509/gradle.properties    | 1 -
 .../java-configuration/authentication/x509/gradle/gretty.gradle | 2 +-
 servlet/java-configuration/data/gradle.properties               | 1 -
 servlet/java-configuration/hello-mvc-security/gradle.properties | 1 -
 .../java-configuration/hello-mvc-security/gradle/gretty.gradle  | 2 +-
 .../hello-security-explicit/gradle.properties                   | 1 -
 .../hello-security-explicit/gradle/gretty.gradle                | 2 +-
 servlet/java-configuration/hello-security/gradle.properties     | 1 -
 servlet/java-configuration/hello-security/gradle/gretty.gradle  | 2 +-
 servlet/java-configuration/max-sessions/gradle.properties       | 1 -
 servlet/java-configuration/max-sessions/gradle/gretty.gradle    | 2 +-
 26 files changed, 12 insertions(+), 25 deletions(-)
 delete mode 100644 servlet/java-configuration/aspectj/gradle.properties
 delete mode 100644 servlet/java-configuration/authentication/preauth/gradle.properties
 rename servlet/java-configuration/authentication/preauth/server/{tomcat85-users.xml => tomcat-users.xml} (100%)
 delete mode 100644 servlet/java-configuration/authentication/remember-me/gradle.properties
 delete mode 100644 servlet/java-configuration/authentication/username-password/form/gradle.properties
 delete mode 100644 servlet/java-configuration/authentication/username-password/in-memory/gradle.properties
 delete mode 100644 servlet/java-configuration/authentication/username-password/jdbc/gradle.properties
 delete mode 100644 servlet/java-configuration/authentication/username-password/ldap/gradle.properties
 delete mode 100644 servlet/java-configuration/authentication/x509/gradle.properties
 delete mode 100644 servlet/java-configuration/data/gradle.properties
 delete mode 100644 servlet/java-configuration/hello-mvc-security/gradle.properties
 delete mode 100644 servlet/java-configuration/hello-security-explicit/gradle.properties
 delete mode 100644 servlet/java-configuration/hello-security/gradle.properties
 delete mode 100644 servlet/java-configuration/max-sessions/gradle.properties

diff --git a/servlet/java-configuration/aspectj/gradle.properties b/servlet/java-configuration/aspectj/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/aspectj/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/aspectj/gradle/gretty.gradle b/servlet/java-configuration/aspectj/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/aspectj/gradle/gretty.gradle
+++ b/servlet/java-configuration/aspectj/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/preauth/gradle.properties b/servlet/java-configuration/authentication/preauth/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/preauth/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle b/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/preauth/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/preauth/server/tomcat85-users.xml b/servlet/java-configuration/authentication/preauth/server/tomcat-users.xml
similarity index 100%
rename from servlet/java-configuration/authentication/preauth/server/tomcat85-users.xml
rename to servlet/java-configuration/authentication/preauth/server/tomcat-users.xml
diff --git a/servlet/java-configuration/authentication/remember-me/gradle.properties b/servlet/java-configuration/authentication/remember-me/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/remember-me/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle b/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/remember-me/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/username-password/form/gradle.properties b/servlet/java-configuration/authentication/username-password/form/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/form/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/username-password/form/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/username-password/in-memory/gradle.properties b/servlet/java-configuration/authentication/username-password/in-memory/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/in-memory/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/in-memory/gradle/gretty.gradle
+++ b/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'
diff --git a/servlet/java-configuration/authentication/username-password/jdbc/gradle.properties b/servlet/java-configuration/authentication/username-password/jdbc/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/jdbc/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/username-password/jdbc/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/username-password/ldap/gradle.properties b/servlet/java-configuration/authentication/username-password/ldap/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/username-password/ldap/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle b/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/username-password/ldap/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/authentication/x509/gradle.properties b/servlet/java-configuration/authentication/x509/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/authentication/x509/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/authentication/x509/gradle/gretty.gradle b/servlet/java-configuration/authentication/x509/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/authentication/x509/gradle/gretty.gradle
+++ b/servlet/java-configuration/authentication/x509/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/data/gradle.properties b/servlet/java-configuration/data/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/data/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-mvc-security/gradle.properties b/servlet/java-configuration/hello-mvc-security/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/hello-mvc-security/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle b/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle
+++ b/servlet/java-configuration/hello-mvc-security/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/hello-security-explicit/gradle.properties b/servlet/java-configuration/hello-security-explicit/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/hello-security-explicit/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle b/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle
+++ b/servlet/java-configuration/hello-security-explicit/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/hello-security/gradle.properties b/servlet/java-configuration/hello-security/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/hello-security/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/hello-security/gradle/gretty.gradle b/servlet/java-configuration/hello-security/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/hello-security/gradle/gretty.gradle
+++ b/servlet/java-configuration/hello-security/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'
diff --git a/servlet/java-configuration/max-sessions/gradle.properties b/servlet/java-configuration/max-sessions/gradle.properties
deleted file mode 100644
index fe89f6a..0000000
--- a/servlet/java-configuration/max-sessions/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-tomcat85Version=8.5.54
diff --git a/servlet/java-configuration/max-sessions/gradle/gretty.gradle b/servlet/java-configuration/max-sessions/gradle/gretty.gradle
index 3df1479..6949bdf 100644
--- a/servlet/java-configuration/max-sessions/gradle/gretty.gradle
+++ b/servlet/java-configuration/max-sessions/gradle/gretty.gradle
@@ -1,5 +1,5 @@
 gretty {
-	servletContainer = "tomcat85"
+	servletContainer = "tomcat9"
 	contextPath = "/"
 	fileLogEnabled = false
 	integrationTestTask = 'integrationTest'