From 285290a27f3d3c8f2517067d8c8d9712eb9caa74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Vanvelthem?= <belgattitude@gmail.com>
Date: Mon, 19 Apr 2021 19:03:05 +0200
Subject: [PATCH] chore(dev-deps): tomcat 8.5

---
 build.gradle | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 312b924..73c3b97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.bmuschko:gradle-tomcat-plugin:2.3'
+        classpath 'com.bmuschko:gradle-tomcat-plugin:2.5'
         //classpath 'io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3'
         //classpath 'org.ajoberstar:gradle-git:1.6.0'
     }
@@ -58,18 +58,22 @@ dependencies {
 
     providedCompile('javax.servlet:servlet-api:2.5')
 
-    def tomcatVersion = '8.5.2'    // must not exclude eclipse compiler since version 7.0.59
+    def tomcatVersion = '8.5.16'
 
-    tomcat(
-            "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
-            "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}",
-            "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}",
-    )
+    tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
+           "org.apache.tomcat.embed:tomcat-embed-logging-juli:8.5.2",
+           "org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}"
 
     runtime('log4j:log4j:1.2.17')
 }
 
 
+tomcat {
+    httpProtocol = 'org.apache.coyote.http11.Http11Nio2Protocol'
+    ajpProtocol  = 'org.apache.coyote.ajp.AjpNio2Protocol'
+}
+
+
 // When testing you can specify your local PHP executable as a system property with
 // -Dphp_exec=/path/to/php-executabale on the Gradle command line
 // Default value is "php" which should work both on Linux and Windows for most standard PHP installations.