Merge branch 'master' of https://github.com/Maiklins/tutorials into BAEL-20856-move-spring-boot-autoconfiguration

Conflicts: spring-boot-modules/pom.xml
2020-01-27 23:14:56 +01:00
parent 488d7675ef 6597b5dd50
commit 9a59bec20d
209 changed files with 750 additions and 185 deletions
@@ -15,7 +15,10 @@

    <modules>
        <module>spring-boot-autoconfiguration</module>
+        <module>spring-boot-data</module>
        <module>spring-boot-mvc-birt</module>
+        <module>spring-boot-properties</module>
+        <module>spring-boot-testing</module>
        <module>spring-boot-vue</module>
    </modules>