Merge branch '5.1.x'

spring-test/spring-test.gradle

@@ -67,7 +67,7 @@ dependencies {
 	testCompile("org.junit.jupiter:junit-jupiter-params")
 	testCompile("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	testCompile("com.thoughtworks.xstream:xstream:1.4.10")
-	testCompile("com.rometools:rome:1.11.1")
+	testCompile("com.rometools:rome:1.12.0")
 	testCompile("org.apache.tiles:tiles-api:${tiles3Version}")
 	testCompile("org.apache.tiles:tiles-core:${tiles3Version}", withoutJclOverSlf4J)
 	testCompile("org.apache.tiles:tiles-servlet:${tiles3Version}", withoutJclOverSlf4J)

spring-web/spring-web.gradle

@@ -58,7 +58,7 @@ dependencies {
 	optional("com.google.code.gson:gson:2.8.5")
 	optional("com.google.protobuf:protobuf-java-util:3.6.1")
 	optional("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
-	optional("com.rometools:rome:1.11.1")
+	optional("com.rometools:rome:1.12.0")
 	optional("com.caucho:hessian:4.0.51")
 	optional("org.codehaus.groovy:groovy:${groovyVersion}")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")

spring-web/src/main/java/org/springframework/web/method/HandlerMethod.java

@@ -480,26 +480,28 @@ public class HandlerMethod {
 			Annotation[] anns = this.combinedAnnotations;
 			if (anns == null) {
 				anns = super.getParameterAnnotations();
-				for (Annotation[][] ifcAnns : getInterfaceParameterAnnotations()) {
-					int index = getParameterIndex();
-					if (index < ifcAnns.length) {
-						Annotation[] paramAnns = ifcAnns[index];
-						if (paramAnns.length > 0) {
-							List<Annotation> merged = new ArrayList<>(anns.length + paramAnns.length);
-							merged.addAll(Arrays.asList(anns));
-							for (Annotation paramAnn : paramAnns) {
-								boolean existingType = false;
-								for (Annotation ann : anns) {
-									if (ann.annotationType() == paramAnn.annotationType()) {
-										existingType = true;
-										break;
+				int index = getParameterIndex();
+				if (index >= 0) {
+					for (Annotation[][] ifcAnns : getInterfaceParameterAnnotations()) {
+						if (index < ifcAnns.length) {
+							Annotation[] paramAnns = ifcAnns[index];
+							if (paramAnns.length > 0) {
+								List<Annotation> merged = new ArrayList<>(anns.length + paramAnns.length);
+								merged.addAll(Arrays.asList(anns));
+								for (Annotation paramAnn : paramAnns) {
+									boolean existingType = false;
+									for (Annotation ann : anns) {
+										if (ann.annotationType() == paramAnn.annotationType()) {
+											existingType = true;
+											break;
+										}
+									}
+									if (!existingType) {
+										merged.add(adaptAnnotation(paramAnn));
 									}
 								}
-								if (!existingType) {
-									merged.add(adaptAnnotation(paramAnn));
-								}
+								anns = merged.toArray(new Annotation[0]);
 							}
-							anns = merged.toArray(new Annotation[0]);
 						}
 					}
 				}

spring-webflux/spring-webflux.gradle

@@ -17,7 +17,7 @@ dependencies {
 	optional(project(":spring-context-support"))  // for FreeMarker support
 	optional("javax.servlet:javax.servlet-api:4.0.1")
 	optional("javax.websocket:javax.websocket-api:1.1")
-	optional("org.webjars:webjars-locator-core:0.35")
+	optional("org.webjars:webjars-locator-core:0.36")
 	optional("org.freemarker:freemarker:${freemarkerVersion}")
 	optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
 	optional("com.fasterxml.jackson.dataformat:jackson-dataformat-smile:${jackson2Version}")