Revert "Temporary fix for Spring snapshot changes"

This reverts commit 8a804f61.

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java

@@ -175,14 +175,14 @@ public class WebMvcAutoConfiguration {
 
 		@Override
 		public void addResourceHandlers(ResourceHandlerRegistry registry) {
-			// FIXME: re-instate this when Spring is updated
-			// if (!registry.hasMappingForPattern("/webjars/**")) {
-			registry.addResourceHandler("/webjars/**").addResourceLocations(
-					"classpath:/META-INF/resources/webjars/");
-			// }
-			// if (!registry.hasMappingForPattern("/**")) {
-			registry.addResourceHandler("/**").addResourceLocations(RESOURCE_LOCATIONS);
-			// }
+			if (!registry.hasMappingForPattern("/webjars/**")) {
+				registry.addResourceHandler("/webjars/**").addResourceLocations(
+						"classpath:/META-INF/resources/webjars/");
+			}
+			if (!registry.hasMappingForPattern("/**")) {
+				registry.addResourceHandler("/**").addResourceLocations(
+						RESOURCE_LOCATIONS);
+			}
 		}
 
 		@Override

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java

@@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -102,8 +101,6 @@ public class WebMvcAutoConfigurationTests {
 	}
 
 	@Test
-	@Ignore
-	// FIXME: re-instate when Spring is back to normal
 	public void resourceHandlerMappingOverrideWebjars() throws Exception {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
 		this.context.register(WebJars.class, Config.class, WebMvcAutoConfiguration.class);
@@ -115,8 +112,6 @@ public class WebMvcAutoConfigurationTests {
 	}
 
 	@Test
-	@Ignore
-	// FIXME: re-instate when Spring is back to normal
 	public void resourceHandlerMappingOverrideAll() throws Exception {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
 		this.context.register(AllResources.class, Config.class,