Merge branch 'master' into BAEL-20862

2020-02-01 00:12:30 +02:00
parent 3c5d496023 8c0e362b3e
commit e4b74cda31
47 changed files with 124 additions and 90 deletions
@@ -15,15 +15,17 @@

    <modules>
        <module>spring-boot-admin</module>
-        <module>spring-boot-custom-starter</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-mvc-birt</module>
-        <module>spring-boot-performance</module>
+        <module>spring-boot-nashorn</module>
        <module>spring-boot-properties</module>
        <module>spring-boot-springdoc</module>
        <module>spring-boot-testing</module>