Samples use @SpringBootApplication

@SpringBootApplication enables component scanning (which was not enabled before). To prevent component scanning from picking up Spring Boot Admin's auto-configuration classes, the package of the samples had to be changed.
codecentric · Apr 15, 2024 · 66633f4 · 66633f4
1 parent a1b1d2a
commit 66633f4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/docker-compose.yml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/docker-compose.yml
@@ -1,5 +1,5 @@
 services:
   consul:
-    image: library/consul
+    image: hashicorp/consul
     ports:
       - "8500:8500"
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-consul/pom.xml
@@ -65,7 +65,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>de.codecentric.boot.admin.SpringBootAdminConsulApplication</mainClass>
+                    <mainClass>de.codecentric.boot.admin.sample.SpringBootAdminConsulApplication</mainClass>
                     <addResources>false</addResources>
                 </configuration>
             </plugin>

diff --git a/...min/SpringBootAdminConsulApplication.java → ...ple/SpringBootAdminConsulApplication.java b/...min/SpringBootAdminConsulApplication.java → ...ple/SpringBootAdminConsulApplication.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package de.codecentric.boot.admin;
+package de.codecentric.boot.admin.sample;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,8 +33,7 @@
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 
-@Configuration(proxyBeanMethods = false)
-@EnableAutoConfiguration
+@SpringBootApplication
 @EnableDiscoveryClient
 @EnableAdminServer
 public class SpringBootAdminConsulApplication {

diff --git a/...SpringBootAdminConsulApplicationTest.java → ...SpringBootAdminConsulApplicationTest.java b/...SpringBootAdminConsulApplicationTest.java → ...SpringBootAdminConsulApplicationTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.codecentric.boot.admin;
+package de.codecentric.boot.admin.sample;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;

diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/docker-compose.yml b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/docker-compose.yml
@@ -0,0 +1,5 @@
+services:
+  zookeeper:
+    image: zookeeper
+    ports:
+      - 2181:2181
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml b/spring-boot-admin-samples/spring-boot-admin-sample-zookeeper/pom.xml
@@ -68,7 +68,7 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <mainClass>de.codecentric.boot.admin.SpringBootAdminZookeeperApplication</mainClass>
+                    <mainClass>de.codecentric.boot.admin.sample.SpringBootAdminZookeeperApplication</mainClass>
                     <addResources>false</addResources>
                 </configuration>
             </plugin>

diff --git a/.../SpringBootAdminZookeeperApplication.java → .../SpringBootAdminZookeeperApplication.java b/.../SpringBootAdminZookeeperApplication.java → .../SpringBootAdminZookeeperApplication.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package de.codecentric.boot.admin;
+package de.codecentric.boot.admin.sample;
 
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,8 +33,7 @@
 import de.codecentric.boot.admin.server.config.AdminServerProperties;
 import de.codecentric.boot.admin.server.config.EnableAdminServer;
 
-@Configuration(proxyBeanMethods = false)
-@EnableAutoConfiguration
+@SpringBootApplication
 @EnableDiscoveryClient
 @EnableAdminServer
 public class SpringBootAdminZookeeperApplication {

diff --git a/...ingBootAdminZookeeperApplicationTest.java → ...ingBootAdminZookeeperApplicationTest.java b/...ingBootAdminZookeeperApplicationTest.java → ...ingBootAdminZookeeperApplicationTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.codecentric.boot.admin;
+package de.codecentric.boot.admin.sample;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;