Merge branch 'master' into JAVA-3533

2021-01-01 22:55:21 +02:00
parent 6630c81406 aec6ef01e4
commit 296fe08dde
109 changed files with 958 additions and 875 deletions
@@ -22,9 +22,11 @@
        <module>spring-mvc-forms-jsp</module>
        <module>spring-mvc-views</module>
        <module>spring-mvc-webflow</module>
+        <module>spring-mvc-xml</module>
        <module>spring-rest-angular</module>
        <module>spring-rest-http</module>
        <module>spring-rest-http-2</module>
+        <module>spring-rest-query-language</module>
        <module>spring-resttemplate-2</module>
        <module>spring-thymeleaf</module>
        <module>spring-thymeleaf-2</module>