Commit Graph

6097 Commits

Author SHA1 Message Date
Phillip Webb
1e4d974ec0 Merge remote-tracking branch 'local12x/1.2.x' 2015-10-19 12:56:55 -07:00
Phillip Webb
a79131f8d2 Organize imports with new settings
See gh-4234
2015-10-19 12:55:44 -07:00
Phillip Webb
47ae7487ac Tweak import order settings
Update the import order settings to be a little more logical. Imports
should now be ordered:

java.*
javax.*
<others>
org.springframework.*
import static *

See gh-4234
2015-10-19 12:17:46 -07:00
Andy Wilkinson
5080e2d71f Merge branch '1.2.x' 2015-10-19 19:09:02 +01:00
Andy Wilkinson
92ba46e1c9 Upgrade to Spring Social Twitter 1.1.2.RELEASE
Closes gh-4238
2015-10-19 19:08:29 +01:00
Stephane Nicoll
4f3025e17c Merge branch '1.2.x' 2015-10-19 15:09:56 +02:00
Stephane Nicoll
a4af835c35 Merge pull request #4212 from zhanhb/patch-4
* pr/4212:
  Fix default value of MongoDB port in doc
2015-10-19 15:09:41 +02:00
zhanhb
299d0653ed Fix default value of MongoDB port in doc
Closes gh-4212
2015-10-19 15:08:43 +02:00
Stephane Nicoll
f34a627145 Merge pull request #4207 from shakuzen/patch-7
* pr/4207:
  Upgrade maven-resources-plugin 2.7
2015-10-19 15:06:20 +02:00
Tommy Ludwig
77bdc2dc26 Upgrade maven-resources-plugin 2.7
Closes gh-4207
2015-10-19 14:45:15 +02:00
Stephane Nicoll
aeec1713eb Fix checkstyle violations 2015-10-19 14:42:11 +02:00
Stephane Nicoll
32b32b7142 Notify the use of logback specific system property
Logback documentation explains how to initialize the logging system and
namely how the `logback.configurationFile` system property can be used to
specify the configuration file to use.

Spring Boot has an abstraction on top of that. A user can define the
`logging.path` property regardless of the logging infrastructure it is
using.

Users following the logback documentation can be confused at first so
we're not logging a warning when we found out that the logback specific
property has been specified.

Closes gh-2382
2015-10-19 14:37:12 +02:00
Tommy Ludwig
e4230e61d7 Make the name of the log file produced by launch script configurable
Previously, the launch script would always use a file named
<appname>.log to capture the application's console output. This commit
adds a variable, LOG_FILENAME, for specifying the file name defaulting
to <appname>.log.

Fixes gh-4194
2015-10-19 11:38:22 +01:00
Stephane Nicoll
fd525077bd Improve HornetQ/Artemis embedded tests
Previously, HornetQ and Artemis tests were using a test configuration
class listing the configuration classes to use explicitly in the purpose
of disabling the XA support.

This had a very unfortunate side effect for Artemis as we forgot to add
an import on the "real" configuration and this got unnoticed because of
this duplication.

It turns out that this special configuration class is no longer necessary
as XA backs off automatically anyway now. The tests have been updated
to use the regular auto-configuration and were failing with Artemis. The
import has now be added.

Closes gh-4226
2015-10-19 11:46:15 +02:00
Huang YunKun
e72b14cb5f Upgrade to ActiveMQ 5.12.1
Closes gh-4219
2015-10-19 10:14:36 +01:00
Stephane Nicoll
f929af32d6 Merge pull request #4222 from izeye/patch-42
* pr/4222:
  Remove unnecessary statement
2015-10-18 09:25:38 +02:00
Johnny Lim
cfaf813da8 Remove unnecessary statement
Closes gh-4222
2015-10-18 09:25:19 +02:00
Stephane Nicoll
8ad020249e Merge pull request #4225 from marc0der/master
* pr/4225:
  Update all GVM references to SDKMAN!
2015-10-18 09:21:16 +02:00
Marco Vermeulen
673bde0bf7 Update all GVM references to SDKMAN!
Closes gh-4225
2015-10-18 09:20:57 +02:00
Stephane Nicoll
8db39140d4 Merge branch '1.2.x' 2015-10-16 15:37:53 +02:00
Spring Buildmaster
2b38a861e3 Next Development Version 2015-10-16 05:57:24 -07:00
Andy Wilkinson
ac944f02cc Use a random HTTP port when running SampleLiquibaseApplicationTests 2015-10-16 12:07:56 +01:00
Andy Wilkinson
56977c037d Merge branch '1.2.x' 2015-10-16 11:19:14 +01:00
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
2015-10-16 11:07:39 +01:00
Andy Wilkinson
f8cffd745c Merge branch '1.2.x' 2015-10-16 10:42:26 +01:00
Andy Wilkinson
874cd3390e Fix version of parent in pom for spring-boot-sample-war 2015-10-16 10:39:58 +01:00
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/
2015-10-16 10:36:20 +01:00
Phillip Webb
1c46fd2a8e Roll back to Groovy 2.4.4
See gh-4210
2015-10-16 00:50:22 -07:00
Phillip Webb
072001e15d Merge branch '1.2.x' 2015-10-16 00:41:29 -07:00
Phillip Webb
b0d287356c Revert "Increase PermGen for CLI integration tests"
This reverts commit 4c26b0c194.
2015-10-16 00:28:05 -07:00
Phillip Webb
d84889b03c Revert "Compile samples and integration tests with Java 8"
This reverts commit 09395f956a.
2015-10-16 00:01:52 -07:00
Phillip Webb
4c26b0c194 Increase PermGen for CLI integration tests 2015-10-15 23:36:18 -07:00
Phillip Webb
5392c0a52b Merge remote-tracking branch 'springsource/1.2.x' 2015-10-15 21:52:28 -07:00
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
2015-10-15 17:52:51 -07:00
Phillip Webb
84305825e7 Throw EmbeddedContainerExceptions from Tomcat
Wrap Tomcat start errors in EmbeddedContainerException.

Fixes gh-4204
2015-10-15 17:51:18 -07:00
Phillip Webb
5a84c02b08 Throw EmbeddedContainerExceptions from Undertow
Wrap Undertow start errors in EmbeddedContainerException.

Fixes gh-4205
2015-10-15 17:49:40 -07:00
Phillip Webb
03d54fa1d0 Polish 2015-10-15 16:15:23 -07:00
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
2015-10-15 16:02:41 -07:00
Phillip Webb
56643222cf Add simple war sample 2015-10-15 15:31:28 -07:00
Phillip Webb
676ff75d9d Polish 2015-10-15 15:30:18 -07:00
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
2015-10-15 16:57:52 +02:00
Stephane Nicoll
f53720ea0e Upgrade to Spring Framework 4.2.2.RELEASE
Closes gh-4020
2015-10-15 15:26:13 +02:00
Stephane Nicoll
50e7646354 Merge branch '1.2.x' 2015-10-15 12:47:06 +02:00
Stephane Nicoll
fddd7c5f91 Upgrade to Spring Framework 4.1.8.RELEASE
Closes gh-4019
2015-10-15 12:45:42 +02:00
Stephane Nicoll
092b2aa4e7 Polish
See gh-4191
2015-10-15 10:38:28 +02:00
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
2015-10-14 23:37:20 -07:00
Phillip Webb
f02c651e40 Rename security-tests-* to security-test-*
Update spring-boot-security-tests to use standard module names.

Fixes gh-4101
2015-10-14 23:25:24 -07:00
Phillip Webb
661737ebac Merge pull request #4137 from bedge/master
* pr/4137:
  Use start-stop-daemon if present in launch.script
2015-10-14 23:19:12 -07:00
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
2015-10-14 23:16:53 -07:00
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
2015-10-14 23:01:49 -07:00