Add Java 11 to smoke test matrix

Author: trask

agent/build.gradle

@@ -74,7 +74,7 @@ shadowJar() {
     // javax.lang.model.element.Modifier which is no longer in the bootstrap class loader in Java 9, and this causes
     // spring class path scanning to fail when trying to read com.google.errorprone.annotations.ForOverride
     // (java.lang.NoClassDefFoundError: [Ljavax/lang/model/element/Modifier;)
-    exclude shadowPrefix.replace('.', '/') + '/com/google/errorprone/**'
+    exclude 'com/google/errorprone/**'
 }
 
 task shadowJar2(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {

test/smoke/appServers/jre.master.txt

@@ -1,2 +1,3 @@
 openjdk:7-jre
-openjdk:8-jre
+openjdk:8-jre
+azul/zulu-openjdk:11

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java

@@ -41,6 +41,7 @@
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.URL;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -70,11 +71,18 @@ public static Collection<Object[]> parameterGenerator() throws IOException {
         List<String> appServers = Resources.readLines(Resources.getResource("appServers.txt"), Charsets.UTF_8);
         System.out.println("Target appservers="+Arrays.toString(appServers.toArray()));
         String os = System.getProperty("applicationinsights.smoketest.os", "linux");
+        URL jreExcludesURL = Thread.currentThread().getContextClassLoader().getResource("jre.excludes.txt");
+        List<String> jreExcludes;
+        if (jreExcludesURL == null) {
+            jreExcludes = new ArrayList<>();
+        } else {
+            jreExcludes = Resources.readLines(jreExcludesURL, Charsets.UTF_8);
+        }
         Multimap<String, String> appServers2jres = HashMultimap.create();
         for (String appServer : appServers) {
             List<String> serverJres;
             try {
-                serverJres = getAppServerJres(appServer);
+                serverJres = getAppServerJres(appServer, jreExcludes);
             } catch (Exception e) {
                 System.err.printf("SKIPPING '%s'. Could not configure jres: %s%n", appServer, e);
                 continue;
@@ -93,14 +101,14 @@ public static Collection<Object[]> parameterGenerator() throws IOException {
         return rval;
     }
 
-    private static List<String> getAppServerJres(String appServer) throws IOException {
-        List<String> rval = Resources.readLines(Resources.getResource(appServer+".jre.txt"), Charsets.UTF_8);
-        return Lists.transform(rval, new Function<String, String>() {
-            @Override
-            public String apply(String input) {
-                return input.replaceAll("[:/]", "_");
+    private static List<String> getAppServerJres(String appServer, List<String> jreExcludes) throws IOException {
+        List<String> jres = new ArrayList<>();
+        for (String jre : Resources.readLines(Resources.getResource(appServer+".jre.txt"), Charsets.UTF_8)) {
+            if (!jreExcludes.contains(jre)) {
+                jres.add(jre.replaceAll("[:/]", "_"));
             }
-        });
+        }
+        return jres;
     }
 
     @Parameter(0) public String appServer;

test/smoke/testApps/SpringBoot1_3Auto/build.gradle

@@ -10,8 +10,9 @@ ext.testAppArtifactFilename = war.archiveFileName.get()
 
 dependencies {
     compile aiWebAutoJar
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.21.RELEASE'
-    providedRuntime group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '1.5.21.RELEASE'
+    compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.3.8.RELEASE') {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
 
     providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
 }

test/smoke/testApps/SpringBoot1_3Auto/src/main/java/com/microsoft/ajl/simple/SpringBootApp.java

@@ -2,7 +2,7 @@
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.context.web.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class SpringBootApp extends SpringBootServletInitializer {

test/smoke/testApps/SpringBoot1_3Auto/src/main/java/com/microsoft/ajl/simple/TestController.java

@@ -1,18 +1,19 @@
 package com.microsoft.ajl.simple;
 
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 public class TestController {
 
-    @GetMapping("/")
+    @RequestMapping(path = "/", method = RequestMethod.GET)
     public String root() {
         return "OK";
     }
 
 
-    @GetMapping("/test")
+    @RequestMapping(path = "/test", method = RequestMethod.GET)
     public String test() {
         return "OK!";
     }

test/smoke/testApps/SpringBoot1_3Auto/src/smokeTest/resources/README.md

@@ -0,0 +1 @@
+`jre.excludes.txt` is needed because Spring Boot 1.3 does not support Java 11

test/smoke/testApps/SpringBoot1_3Auto/src/smokeTest/resources/jre.excludes.txt

@@ -0,0 +1 @@
+azul/zulu-openjdk:11

test/smoke/testApps/SpringBootAuto/build.gradle

@@ -10,8 +10,10 @@ ext.testAppArtifactFilename = war.archiveFileName.get()
 
 dependencies {
     compile aiWebAutoJar
-    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.21.RELEASE'
-    providedRuntime group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version: '1.5.21.RELEASE'
+    compile (group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.7.RELEASE') {
+        exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+    }
+    compile group: 'org.reactivestreams', name: 'reactive-streams', version: '1.0.3'
 
     providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
 }

test/smoke/testApps/SpringBootAuto/src/main/java/com/microsoft/ajl/simple/SpringBootApp.java

@@ -2,7 +2,7 @@
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class SpringBootApp extends SpringBootServletInitializer {