Merge branch '2.6.x' into 2.7.x

pull/29745/head
Phillip Webb 3 years ago
commit 26dd6b826c

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -19,8 +19,8 @@ package org.springframework.boot.docs.using.usingthespringbootapplicationannotat
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication // same as @SpringBootConfiguration @EnableAutoConfiguration // Same as @SpringBootConfiguration @EnableAutoConfiguration @ComponentScan
// @ComponentScan @SpringBootApplication
public class MyApplication { public class MyApplication {
public static void main(String[] args) { public static void main(String[] args) {

Loading…
Cancel
Save