Merge pull request #32924 from SmithaSubbarao/add-spring4-war-tests-concurrency-mbean

Enable Spring 4.0 WAR tests for Concurrency and MBean

Author: SmithaSubbarao

dev/io.openliberty.springboot.fat40.concurrency.app/build.gradle

@@ -27,7 +27,12 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
 
 dependencies {
   implementation('org.springframework.boot:spring-boot-starter-web')
-  providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
+  // Should use spring-boot-starter-tomcat as provideCompile, but gradle plugin
+  // is putting too much in lib-provided: see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/409
+  // providedCompile('org.springframework.boot:spring-boot-starter-tomcat')
+  providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
+  providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
+  providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
 }
 
 bootJar {

dev/io.openliberty.springboot.fat40.mbean.app/build.gradle

@@ -28,7 +28,12 @@ apply from: '../wlp-gradle/subprojects/maven-central-mirror.gradle'
 
 dependencies {
   implementation('org.springframework.boot:spring-boot-starter-web') // + ':' + sv['springBoot'])
-  providedRuntime('org.springframework.boot:spring-boot-starter-tomcat')
+   // Should use spring-boot-starter-tomcat as provideCompile, but gradle plugin
+  // is putting too much in lib-provided: see https://github.com/spring-gradle-plugins/dependency-management-plugin/issues/409
+  // providedCompile('org.springframework.boot:spring-boot-starter-tomcat')
+  providedRuntime('org.apache.tomcat.embed:tomcat-embed-core')
+  providedRuntime('org.apache.tomcat.embed:tomcat-embed-el')
+  providedRuntime('org.apache.tomcat.embed:tomcat-embed-websocket')
 }
 
 bootJar {

dev/io.openliberty.springboot.fat40_fat/fat/src/com/ibm/ws/springboot/support/fat/FATSuite.java

@@ -63,7 +63,9 @@
                 TemplateTests40.class,
                 ApplicationStartedEventTests40.class,
                 ConcurrencyAppTests40.class,
+                ConcurrencyAppTests40War.class,
                 MBeanAppTests40.class,
+                MBeanAppTests40War.class,
                 JmsSpringBootAppTests40.class,
                 JmsWebAppTests40.class