Merge branch 'master' into BAEL-20863-move-spring-boot-ctx-fluent

2020-01-30 10:49:42 +01:00 · 2020-01-30 10:49:42 +01:00 · d8de7991c7
parent eed6c84c0b edc39bfffd
commit d8de7991c7
23 changed files with 2 additions and 6 deletions
--- a/pom.xml
+++ b/pom.xml
@ -640,7 +640,6 @@

                <module>spring-boot</module>
                <module>spring-boot-modules</module>
-                <module>spring-boot-admin</module>
                <module>spring-boot-angular</module>
                <module>spring-boot-autoconfiguration</module>
                <module>spring-boot-bootstrap</module>
@ -1170,7 +1169,6 @@

                <module>spring-boot</module>
                <module>spring-boot-modules</module>
-                <module>spring-boot-admin</module>
                <module>spring-boot-angular</module>
                <module>spring-boot-autoconfiguration</module>
                <module>spring-boot-bootstrap</module>
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@ -14,7 +14,7 @@
    </parent>

    <modules>
-        <module>spring-boot-ctx-fluent</module>
+        <module>spring-boot-admin</module>
        <module>spring-boot-artifacts</module>
        <module>spring-boot-ctx-fluent</module>
        <module>spring-boot-data</module>
--- a/spring-boot-modules/spring-boot-admin/README.md
+++ b/spring-boot-modules/spring-boot-admin/README.md
--- a/spring-boot-modules/spring-boot-admin/pom.xml
+++ b/spring-boot-modules/spring-boot-admin/pom.xml
@ -11,7 +11,7 @@
        <groupId>com.baeldung</groupId>
        <artifactId>parent-boot-2</artifactId>
        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
    </parent>

    <modules>
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/.gitignore
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/.gitignore
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/pom.xml
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/pom.xml
@ -12,7 +12,6 @@
        <groupId>com.baeldung</groupId>
        <artifactId>spring-boot-admin</artifactId>
        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../spring-boot-admin</relativePath>
    </parent>

    <dependencies>
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplication.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/application.properties
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/main/resources/logback.xml
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/com/baeldung/springbootadminclient/SpringBootAdminClientApplicationIntegrationTest.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextTest.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/.gitignore
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/.gitignore
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml
@ -12,7 +12,6 @@
        <groupId>com.baeldung</groupId>
        <artifactId>spring-boot-admin</artifactId>
        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../spring-boot-admin</relativePath>
    </parent>

    <dependencies>
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/SpringBootAdminServerApplication.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/HazelcastConfig.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/NotifierConfiguration.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/application.properties
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/resources/logback.xml
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/HazelcastConfigIntegrationTest.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/NotifierConfigurationIntegrationTest.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java
--- a/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java
+++ b/spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextTest.java