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

Conflicts: spring-boot-modules/pom.xml
2020-01-28 09:24:23 +01:00
parent 5f34d371e6 288ecf151c
commit f243ad531c
210 changed files with 803 additions and 185 deletions
@@ -15,7 +15,10 @@

    <modules>
        <module>spring-boot-camel</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>