Merge branch '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-01-08 11:31:17 +01:00
commit 2b304e3d69
2 changed files with 4 additions and 4 deletions

View File

@ -46,7 +46,7 @@ Here is a quick teaser of a complete Spring Boot application in Java:
return "Hello World!"; return "Hello World!";
} }
public static void main(String[] args) throws Exception { public static void main(String[] args) {
SpringApplication.run(Example.class, args); SpringApplication.run(Example.class, args);
} }

View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2018 the original author or authors. * Copyright 2012-2019 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.
@ -106,7 +106,7 @@ import org.springframework.web.context.support.StandardServletEnvironment;
* *
* // ... Bean definitions * // ... Bean definitions
* *
* public static void main(String[] args) throws Exception { * public static void main(String[] args) {
* SpringApplication.run(MyApplication.class, args); * SpringApplication.run(MyApplication.class, args);
* } * }
* } * }
@ -117,7 +117,7 @@ import org.springframework.web.context.support.StandardServletEnvironment;
* customized before being run: * customized before being run:
* *
* <pre class="code"> * <pre class="code">
* public static void main(String[] args) throws Exception { * public static void main(String[] args) {
* SpringApplication application = new SpringApplication(MyApplication.class); * SpringApplication application = new SpringApplication(MyApplication.class);
* // ... customize application settings here * // ... customize application settings here
* application.run(args) * application.run(args)