[RESTEASY-2314] Upgrade to SpringFramework 5.0.14.RELEASE

resteasy · Aug 30, 2019 · 8e46d57 · 8e46d57
1 parent 7795f36
commit 8e46d57
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -89,6 +89,7 @@
         <version.org.reactivestreams>1.0.2</version.org.reactivestreams>
         <version.org.hibernate.validator>6.0.16.Final</version.org.hibernate.validator>
         <version.org.jboss.marshalling.jboss-marshalling>2.0.6.Final</version.org.jboss.marshalling.jboss-marshalling>
+        <version.org.springframework>5.0.14.RELEASE</version.org.springframework>
     </properties>
 
     <distributionManagement>

diff --git a/resteasy-spring/src/test/resources/spring-test-server.xml b/resteasy-spring/src/test/resources/spring-test-server.xml
@@ -18,11 +18,11 @@
     <!--  use MyCustomView as a view - this takes the bean name and uses it to resolve the name "myCustomView" -->
     <bean class="org.springframework.web.servlet.view.BeanNameViewResolver"/>
 
-	<bean id="resteasy.handlerMapping" parent="abstract.resteasy.handlerMapping" p:order="1" p:throwNotFound="true">
-		<property name="interceptors" ref="resteasy.dispatcher.interceptors"/>
-	</bean>
-    <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" p:order="0"/>
-    <bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"/>
+    <bean id="resteasy.handlerMapping" parent="abstract.resteasy.handlerMapping" p:order="1" p:throwNotFound="true">
+        <property name="interceptors" ref="resteasy.dispatcher.interceptors"/>
+    </bean>
+    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping" p:order="0"/>
+    <bean class="org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter"/>
 
     <!-- Register the same class twice, under two different scopes and URL "root contexts" -->
     <bean id="singletonScopedResource" scope="singleton"

diff --git a/testsuite/integration-tests-spring/pom.xml b/testsuite/integration-tests-spring/pom.xml
@@ -16,7 +16,7 @@
     <name>RESTEasy Main testsuite: Spring integration tests</name>
 
     <properties>
-        <version.org.springframework>4.3.22.RELEASE</version.org.springframework>
+        <version.org.springframework>5.0.14.RELEASE</version.org.springframework>
         <version.org.aspectj>1.7.3</version.org.aspectj>
         <version.aopalliance>1.0</version.aopalliance>
     </properties>