Merge branch 'master' into JAVA-3533

2020-12-30 15:48:46 +02:00
parent d84de4ccdf 3f29e25765
commit 6630c81406
169 changed files with 613 additions and 221 deletions
@@ -20,8 +20,12 @@
        <module>spring-mvc-basics-4</module>     
        <module>spring-mvc-crash</module>
        <module>spring-mvc-forms-jsp</module>
+        <module>spring-mvc-views</module>
+        <module>spring-mvc-webflow</module>
+        <module>spring-rest-angular</module>
        <module>spring-rest-http</module>
        <module>spring-rest-http-2</module>
+        <module>spring-resttemplate-2</module>
        <module>spring-thymeleaf</module>
        <module>spring-thymeleaf-2</module>
        <module>spring-thymeleaf-3</module>