Merge branch 'master' of https://github.com/Maiklins/tutorials into JAVA-3528-move-spring-mvc-velocity-module

Conflicts: spring-web-modules/pom.xml
2020-12-30 12:41:29 +01:00
parent 6a0313b4db 918057ed1b
commit c2a10624ec
17 changed files with 19 additions and 4 deletions
@@ -664,7 +664,6 @@
                <module>spring-mvc-java-2</module>

                <module>spring-mvc-views</module>
-                <module>spring-mvc-webflow</module>
                <module>spring-mvc-xml</module>

                <module>spring-protobuf</module>
@@ -1131,7 +1130,6 @@
                <module>spring-mvc-java-2</module>

                <module>spring-mvc-views</module>
-                <module>spring-mvc-webflow</module>
                <module>spring-mvc-xml</module>

                <module>spring-protobuf</module>