SONAR-20874 Update org.apache.tomcat.embed to 9.0.82.

diff --git a/build.gradle b/build.gradle
index c8904c6a9f549f05ecb64f4adbbfaef15b76a1eb..0d576ffa37ff599cf707f6a0ff7902e1e171f102 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -364,7 +364,7 @@ subprojects {
         entry 'log4j-api'
         entry 'log4j-to-slf4j'
       }
-      dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.74') {
+      dependencySet(group: 'org.apache.tomcat.embed', version: '9.0.82') {
         entry 'tomcat-embed-core'
         entry('tomcat-embed-jasper') {
           exclude 'org.eclipse.jdt.core.compiler:ecj'

diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java
index 95a3ae67a9fe8a1e0ca4a35ad481ce5fa04fa5eb..b31a9d1090ae5c311b8be2b6a37e7f0cefc63640 100644 (file)
--- a/server/sonar-webserver/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java
+++ b/server/sonar-webserver/src/test/java/org/sonar/server/app/EmbeddedTomcatTest.java
@@ -72,7 +72,7 @@ public class EmbeddedTomcatTest {
 
     assertThatThrownBy(tomcat::start)
       .isInstanceOf(IllegalArgumentException.class)
-      .hasMessage(String.format("Unsupported connector: Connector[AJP/1.3-%s]", httpPort));
+      .hasMessage(String.format("Unsupported connector: Connector[\"ajp-nio-127.0.0.1-%s\"]", httpPort));
   }
 
   private Connector getAJPConnector(Props props) {