Merge branch '2.1.x'

Closes gh-18226

Author: wilkinsona

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -2117,6 +2117,16 @@
 				<artifactId>groovy-xml</artifactId>
 				<version>${groovy.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.codehaus.janino</groupId>
+				<artifactId>commons-compiler</artifactId>
+				<version>${janino.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.janino</groupId>
+				<artifactId>commons-compiler-jdk</artifactId>
+				<version>${janino.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.codehaus.janino</groupId>
 				<artifactId>janino</artifactId>