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

Conflicts: spring-boot-modules/pom.xml
2020-02-01 16:42:36 +01:00
parent f38e666af4 20302f8baf
commit f9a386854f
228 changed files with 846 additions and 880 deletions
@@ -14,11 +14,19 @@
    </parent>

    <modules>
+        <module>spring-boot-admin</module>
        <module>spring-boot-artifacts</module>
+        <module>spring-boot-autoconfiguration</module>
+        <module>spring-boot-camel</module>
+        <module>spring-boot-custom-starter</module>
+        <module>spring-boot-crud</module>
        <module>spring-boot-data</module>
+        <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
        <module>spring-boot-keycloak</module>
+        <module>spring-boot-logging-log4j2</module>
        <module>spring-boot-kotlin</module>
        <module>spring-boot-mvc-birt</module>
+        <module>spring-boot-nashorn</module>
        <module>spring-boot-properties</module>
        <module>spring-boot-springdoc</module>
        <module>spring-boot-testing</module>