Merge branch 'master' into JAVA-3528-move-spring-mvc-velocity-module

This commit is contained in:
Loredana Crusoveanu
2021-01-02 14:04:41 +02:00
committed by GitHub
291 changed files with 1163 additions and 895 deletions
-18
View File
@@ -658,21 +658,11 @@
<module>spring-mobile</module>
<module>spring-mockito</module>
<module>spring-mvc-forms-thymeleaf</module>
<module>spring-mvc-java</module>
<module>spring-mvc-java-2</module>
<module>spring-mvc-views</module>
<module>spring-mvc-xml</module>
<module>spring-protobuf</module>
<module>spring-quartz</module>
<module>spring-reactor</module>
<module>spring-remoting</module>
<module>spring-rest-http-2</module>
<module>spring-rest-query-language</module>
<module>spring-rest-shell</module>
<module>spring-rest-simple</module>
<module>spring-resttemplate</module>
@@ -1125,19 +1115,11 @@
<module>spring-mobile</module>
<module>spring-mockito</module>
<module>spring-mvc-forms-thymeleaf</module>
<module>spring-mvc-java</module>
<module>spring-mvc-java-2</module>
<module>spring-mvc-views</module>
<module>spring-mvc-xml</module>
<module>spring-protobuf</module>
<module>spring-quartz</module>
<module>spring-reactor</module>
<module>spring-remoting</module>
<module>spring-rest-query-language</module>
<module>spring-rest-shell</module>
<module>spring-rest-simple</module>
<module>spring-resttemplate</module>