Commit Graph

6128 Commits (71c8a114f121186bcbb643e56639f3f18defb606)
 

Author SHA1 Message Date
Stephane Nicoll 8db39140d4 Merge branch '1.2.x' 9 years ago
Spring Buildmaster 2b38a861e3 Next Development Version 9 years ago
Andy Wilkinson ac944f02cc Use a random HTTP port when running SampleLiquibaseApplicationTests 9 years ago
Andy Wilkinson 56977c037d Merge branch '1.2.x' 9 years ago
Andy Wilkinson c236db04ef Ignore parent contexts in message source auto-configuration
This commit applies the changes made in 68b55ad to 1.2.x (it was
originally only made in 1.0.x and master). It also adds some tests.

Closes gh-3803
9 years ago
Andy Wilkinson f8cffd745c Merge branch '1.2.x' 9 years ago
Andy Wilkinson 874cd3390e Fix version of parent in pom for spring-boot-sample-war 9 years ago
Andy Wilkinson 35a3f4a1c0 Reinstate the use of shutdown hooks in the tests
Commit adf2c44b was an attempt to prevent HSQLDB from throwing an
exception when the JVM exits. This was achieved by disabling the
application context’s shutdown hook in the tests. This had the unwanted
side effect of causing tests’ application contexts not to be closed. The
reported symptom was that @Destroy methods were no longer being invoked.
We need a different solution to the problem.

The exception was:

Caused by: org.hsqldb.HsqlException: Database lock acquisition failure: attempt to connect while db opening /closing
    at org.hsqldb.error.Error.error(Unknown Source)
    at org.hsqldb.error.Error.error(Unknown Source)
    at org.hsqldb.error.Error.error(Unknown Source)
    at org.hsqldb.DatabaseManager.getDatabase(Unknown Source)
    at org.hsqldb.DatabaseManager.newSession(Unknown Source)
    ... 23 common frames omitted

I originally thought this was due to a race between the application
context’s shutdown hook and HSQLDB’s shutdown hook, however HSQLDB
doesn’t use a shutdown hook. I believe that the problem is due to 
an HSQLDB database being created with shutdown=true in its URL, similar
to the problem described here [1]. This will shut down the database when
the last connection to it is closed, however the shutdown will happen
asynchronously. If the JVM then runs the application context’s shutdown
hook, EmbeddedDatabaseFactory will attempt to connect to the database to
execute the SHUTDOWN command. This executes synchronously but will race
with the asynchronous shutdown that’s executing as a result of
shutdown=true in the JDBC url and the last connection to the database
being closed. 

This commit reinstates the use of application context shutdown hooks in
the tests, and updates the documentation to recommend that, if a user
manually configures the URL for their embedded database, they do so 
in such a way that the database doesn’t shutdown automatically, thereby
allowing the shutdown to be driven by application context close.

Closes gh-4208

[1] http://sourceforge.net/p/hsqldb/bugs/1400/
9 years ago
Phillip Webb 1c46fd2a8e Roll back to Groovy 2.4.4
See gh-4210
9 years ago
Phillip Webb 072001e15d Merge branch '1.2.x' 9 years ago
Phillip Webb b0d287356c Revert "Increase PermGen for CLI integration tests"
This reverts commit 4c26b0c194.
9 years ago
Phillip Webb d84889b03c Revert "Compile samples and integration tests with Java 8"
This reverts commit 09395f956a.
9 years ago
Phillip Webb 4c26b0c194 Increase PermGen for CLI integration tests 9 years ago
Phillip Webb 5392c0a52b Merge remote-tracking branch 'springsource/1.2.x' 9 years ago
Phillip Webb 7e99d08473 Fail startup if management server can't start
Update EndpointWebMvcAutoConfiguration to no longer catch and ignore
EmbeddedServletContainerExceptions. Since commit 764e34b9, starting a
management on a different port is not even attempted when running in a
classic servlet container. This means that the catch/log logic (which
was originally added in 45315a97) is no longer necessary, and only
serves to hide genuine problems.

Fixes gh-4064
9 years ago
Phillip Webb 84305825e7 Throw EmbeddedContainerExceptions from Tomcat
Wrap Tomcat start errors in EmbeddedContainerException.

Fixes gh-4204
9 years ago
Phillip Webb 5a84c02b08 Throw EmbeddedContainerExceptions from Undertow
Wrap Undertow start errors in EmbeddedContainerException.

Fixes gh-4205
9 years ago
Phillip Webb 03d54fa1d0 Polish 9 years ago
Phillip Webb c804299c8d Prevent Undertow from exposing classpath files
Update `UndertowEmbeddedServletContainerFactory` so that the
`ClassPathResourceManager` is no longer registered by default.

Prior to this commit the resource manager would be registered whenever
a valid document root could not be found. This had the effect of
exposing all classpath files.

Fixes gh-4015
9 years ago
Phillip Webb 56643222cf Add simple war sample 9 years ago
Phillip Webb 676ff75d9d Polish 9 years ago
Stephane Nicoll 4eefd92e82 Customize active profiles via a dedicated property
This commit adds a dedicated property to specify the active profiles to
use when running an application via the Maven plugin. This works also
on the command line using the `run.profiles` system property and is
consistently applied whether the process is forked or not.

Closes gh-4199
9 years ago
Stephane Nicoll f53720ea0e Upgrade to Spring Framework 4.2.2.RELEASE
Closes gh-4020
9 years ago
Stephane Nicoll 50e7646354 Merge branch '1.2.x' 9 years ago
Stephane Nicoll fddd7c5f91 Upgrade to Spring Framework 4.1.8.RELEASE
Closes gh-4019
9 years ago
Stephane Nicoll 092b2aa4e7 Polish
See gh-4191
9 years ago
Phillip Webb e0f62308bc Defer SpringBootServletInitializer getLog
Change `SpringBootServletInitializer` so that the logger is created
in `onStartup` rather than on class creation. The allows logging to
be initialized in an different WebApplicationInitializer.

Fixes gh-3704
9 years ago
Phillip Webb f02c651e40 Rename `security-tests-*` to `security-test-*`
Update spring-boot-security-tests to use standard module names.

Fixes gh-4101
9 years ago
Phillip Webb 661737ebac Merge pull request #4137 from bedge/master
* pr/4137:
  Use start-stop-daemon if present in launch.script
9 years ago
Bruce Edge df07151f10 Use start-stop-daemon if present in launch.script
Update `launch.script` to use `start-stop-daemon` when possible to
manage daemon processes. When `start-stop-daemon` is not available `su`
is used.

Closes gh-4137
9 years ago
Phillip Webb eef5e18eec Rename AppliationTemp.getFolder() to getDir()
Update ApplicationTemp so that `dir` is used in preference to `folder`.
This better aligns with the existing ApplicationHome class.

Fixes gh-4192
9 years ago
Phillip Webb 922f8b6ba6 Add `server.session.store-dir` support
Add support for a `server.session.store-dir` property which can be used
to specify where session data source be saved.

Fixes gh-4191
9 years ago
Phillip Webb 1a764d9c06 Default Tomcat to not save SESSIONS.ser file
Update TomcatEmbeddedServletContainerFactory so that session data isn't
serialized by default. Prior to this commit the SESSIONS.ser file would
either be written to `/tmp` or into `baseDir` (if one was set).

By not saving session data we align Tomcat with the other embedded
servlet containers and reduce the risk of sensitive information being
left in `/tmp`.

Fixes gh-4156
9 years ago
Phillip Webb bbee66bac9 Merge pull request #4168 from d10xa/gh-925
* gh-4168:
  Add `spring war` command
9 years ago
Andrey Stolyarov 9a63e574b6 Add `spring war` command
Add a `war` command to the CLI to generate WAR archives.

Fixes gh-925
Closes gh-4168
9 years ago
Andy Wilkinson b1aebe6075 Upgrade to Derby 10.12.1.1
Closes gh-4184
9 years ago
Andy Wilkinson 38f11fdd54 Upgrade to JMustache 1.11
Closes gh-4183
9 years ago
Andy Wilkinson f0609343f1 Upgrade to webjars-locator 0.28
Closes gh-4182
9 years ago
Andy Wilkinson 59e3cb3a08 Upgrade to Postgresql 9.4-1204-jdbc41
Closes gh-4181
9 years ago
Andy Wilkinson 5168477695 Upgrade to Jolokia 1.3.2
Closes gh-4180
9 years ago
Andy Wilkinson 421e307bc3 Upgrade to Infinispan 8.0.1.Final
Closes gh-4179
9 years ago
Andy Wilkinson 057ce1bed9 Upgrade to Hibernate Validator 5.2.2.Final
Closes gh-4178
9 years ago
Andy Wilkinson 7171ef927d Upgrade to Jersey 2.22.1
Closes gh-4177
9 years ago
Andy Wilkinson 23e3548c8c Upgrade to Log4J 2.4.1
Closes gh-4176
9 years ago
Andy Wilkinson 17c28220cb Upgrade to httpclient to 4.5.1 and httpcore to 4.4.3
Closes gh-4174
Closes gh-4175
9 years ago
Andy Wilkinson a3e202e22f Upgrade to Artemis 1.1.0
Closes gh-4173
9 years ago
Andy Wilkinson 2422cfde07 Upgrade to thymeleaf-layout-dialect 1.3.1
Closes gh-4172
9 years ago
Andy Wilkinson 02053e2b50 Upgrade to HikariCP 2.4.1
The Java 6 module has been dropped in 2.4. Dependency management for
HikariCP-java6 is retained at the latest available version; 2.3.9.

Closes gh-4171
9 years ago
Andy Wilkinson 61698b4214 Upgrade to Hazelcast 3.5.3
Closes gh-4169
9 years ago
Andy Wilkinson 73ee21b402 Provide dependency management for JBoss Logging
Several libraries that Spring Boot supports depend on JBoss Logging but
they use a variety of versions. This means that the actual version of
JBoss Logging that will be used depends on your build system. Gradle
will pick the latest version that’s in the dependency graph, Maven
will pick the version that’s nearest the root of the graph and, if two
dependencies are equidistant, it’ll pick the version that’s pulled in
by the dependency listed first in the pom. In short, it’s very hard to
reason about the version of JBoss Logging that you’ll actually use at
runtime.

This commit adds dependency management for JBoss Logging so that a
consistent version is used, irrespective of your build system or
dependencies.

Closes gh-4185
9 years ago