Merge branch 'master' into JAVA-3543

This commit is contained in:
Loredana Crusoveanu 2020-12-27 18:01:27 +02:00 committed by GitHub
commit 5f59cf3c8f
61 changed files with 6 additions and 7 deletions

View File

@ -658,7 +658,6 @@
<module>spring-mobile</module>
<module>spring-mockito</module>
<module>spring-mvc-forms-jsp</module>
<module>spring-mvc-forms-thymeleaf</module>
<module>spring-mvc-java</module>
<module>spring-mvc-java-2</module>
@ -1132,7 +1131,6 @@
<module>spring-mobile</module>
<module>spring-mockito</module>
<module>spring-mvc-forms-jsp</module>
<module>spring-mvc-forms-thymeleaf</module>
<module>spring-mvc-java</module>
<module>spring-mvc-java-2</module>
@ -1141,7 +1139,6 @@
<module>spring-mvc-views</module>
<module>spring-mvc-webflow</module>
<module>spring-mvc-xml</module>
<module>spring-mvc-crash</module>
<module>spring-protobuf</module>
<module>spring-quartz</module>

View File

@ -17,7 +17,9 @@
<module>spring-mvc-basics</module>
<module>spring-mvc-basics-2</module>
<module>spring-mvc-basics-3</module>
<module>spring-mvc-basics-4</module>
<module>spring-mvc-basics-4</module>
<module>spring-mvc-crash</module>
<module>spring-mvc-forms-jsp</module>
<module>spring-thymeleaf</module>
</modules>

View File

@ -10,8 +10,8 @@
<parent>
<groupId>com.baeldung</groupId>
<artifactId>parent-modules</artifactId>
<version>1.0.0-SNAPSHOT</version>
<artifactId>spring-web-modules</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
<dependencies>

View File

@ -11,7 +11,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-spring-5</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-spring-5</relativePath>
<relativePath>../../parent-spring-5</relativePath>
</parent>
<dependencies>