Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.2.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2015-10-16 10:42:26 +01:00
parent 874cd3390e 35a3f4a1c0
commit f8cffd745c
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@@ -71,7 +71,7 @@
<gemfire.version>8.1.0</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>1.12</gradle.version>
<groovy.version>2.4.5</groovy.version>
<groovy.version>2.4.4</groovy.version>
<gson.version>2.3.1</gson.version>
<h2.version>1.4.190</h2.version>
<hamcrest.version>1.3</hamcrest.version>

10
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -2123,10 +2123,12 @@ For example, typical POM dependencies would be:
</dependency>
----
TIP: If you're using H2 and, for whatever reason, you do configure its connection URL,
care should be taken to disable the database's automatic shutdown using
`DB_CLOSE_ON_EXIT=FALSE`. This allows Spring Boot to control when the database is closed,
thereby ensuring that it happens once access to the database is no longer needed.
TIP: If, for whatever reason, you do configure the connection URL for an embedded
database, care should be taken to ensure that the database’s automatic shutdown is
disabled. If you're using H2 you should use `DB_CLOSE_ON_EXIT=FALSE` to do so. If you're
using HSQLDB, you should ensure that `shutdown=true` is not used. Disabling the database's
automatic shutdown allows Spring Boot to control when the database is closed, thereby
ensuring that it happens once access to the database is no longer needed.
NOTE: You need a dependency on `spring-jdbc` for an embedded database to be
auto-configured. In this example it's pulled in transitively via

1
spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationContextLoader.java
View File

@@ -82,7 +82,6 @@ public class SpringApplicationContextLoader extends AbstractContextLoader {
throws Exception {
assertValidAnnotations(config.getTestClass());
SpringApplication application = getSpringApplication();
application.setRegisterShutdownHook(false);
application.setMainApplicationClass(config.getTestClass());
application.setSources(getSources(config));
ConfigurableEnvironment environment = new StandardEnvironment();