Merge branch '4.2.x'

Author: marcingrzejszczak

spring-cloud-contract-verifier/pom.xml

@@ -252,11 +252,6 @@
 			<groupId>org.eclipse.jetty.ee10</groupId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<artifactId>jetty-ee10-servlet</artifactId>
-			<groupId>org.eclipse.jetty.ee10</groupId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<artifactId>jetty-ee10-servlets</artifactId>
 			<groupId>org.eclipse.jetty.ee10</groupId>

spring-cloud-contract-verifier/src/test/groovy/org/springframework/cloud/contract/verifier/util/SyntaxChecker.groovy

@@ -170,6 +170,7 @@ private void test(String test) {
 	private static String updatedTest(String test, String className) {
 		test.replaceAll("class FooTest", "class " + className)
 				.replaceAll("import javax.ws.rs.core.Response", "import javax.ws.rs.core.Response; import javax.ws.rs.client.WebTarget;")
+				.replaceAll(";;", ";")
 	}
 
 	private static GString getStaticImports(String builderName) {
@@ -184,6 +185,7 @@ private void test(String test) {
 		String fqnClassName = "com.example.${className}"
 		test = test.replaceAll("class FooTest", "class " + className)
 				.replaceAll("import javax.ws.rs.core.Response", "import javax.ws.rs.core.Response; import javax.ws.rs.client.WebTarget;")
+				.replaceAll(";;", ";")
 		return compileJava(fqnClassName, test)
 
 	}
@@ -200,7 +202,7 @@ private void test(String test) {
 				new StringWriter(),
 				fileManager,
 				diagnostics,
-				null,
+				List.of("-Xlint:-options"),
 				null,
 				Collections.singletonList(javaFile)
 		)