Commit Graph

6070 Commits

Author SHA1 Message Date
Andy Wilkinson
874cd3390e Fix version of parent in pom for spring-boot-sample-war 2015-10-16 10:39:58 +01: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
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
2015-10-14 22:56:01 -07:00
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
2015-10-14 21:30:19 -07:00
Phillip Webb
bbee66bac9 Merge pull request #4168 from d10xa/gh-925
* gh-4168:
  Add `spring war` command
2015-10-14 20:51:48 -07:00
Andrey Stolyarov
9a63e574b6 Add spring war command
Add a `war` command to the CLI to generate WAR archives.

Fixes gh-925
Closes gh-4168
2015-10-14 20:16:21 -07:00
Andy Wilkinson
b1aebe6075 Upgrade to Derby 10.12.1.1
Closes gh-4184
2015-10-14 21:36:19 +01:00
Andy Wilkinson
38f11fdd54 Upgrade to JMustache 1.11
Closes gh-4183
2015-10-14 21:36:18 +01:00
Andy Wilkinson
f0609343f1 Upgrade to webjars-locator 0.28
Closes gh-4182
2015-10-14 21:36:18 +01:00
Andy Wilkinson
59e3cb3a08 Upgrade to Postgresql 9.4-1204-jdbc41
Closes gh-4181
2015-10-14 21:36:18 +01:00
Andy Wilkinson
5168477695 Upgrade to Jolokia 1.3.2
Closes gh-4180
2015-10-14 21:36:18 +01:00
Andy Wilkinson
421e307bc3 Upgrade to Infinispan 8.0.1.Final
Closes gh-4179
2015-10-14 21:36:18 +01:00
Andy Wilkinson
057ce1bed9 Upgrade to Hibernate Validator 5.2.2.Final
Closes gh-4178
2015-10-14 21:36:18 +01:00
Andy Wilkinson
7171ef927d Upgrade to Jersey 2.22.1
Closes gh-4177
2015-10-14 21:36:18 +01:00
Andy Wilkinson
23e3548c8c Upgrade to Log4J 2.4.1
Closes gh-4176
2015-10-14 21:36:18 +01:00
Andy Wilkinson
17c28220cb Upgrade to httpclient to 4.5.1 and httpcore to 4.4.3
Closes gh-4174
Closes gh-4175
2015-10-14 21:36:18 +01:00
Andy Wilkinson
a3e202e22f Upgrade to Artemis 1.1.0
Closes gh-4173
2015-10-14 21:36:18 +01:00
Andy Wilkinson
2422cfde07 Upgrade to thymeleaf-layout-dialect 1.3.1
Closes gh-4172
2015-10-14 21:36:18 +01:00
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
2015-10-14 21:36:17 +01:00
Andy Wilkinson
61698b4214 Upgrade to Hazelcast 3.5.3
Closes gh-4169
2015-10-14 21:36:17 +01:00
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
2015-10-14 21:36:17 +01:00
Phillip Webb
ef0e6b13b9 Merge pull request #3948 from wwadge/master
* gh-3948-2:
  Allow TraceWebFilter to trace more attributes
2015-10-14 13:26:00 -07:00
Wallace Wadge
e3315d2252 Allow TraceWebFilter to trace more attributes
Update TraceWebFilter to optionally trace more details from the
HttpServletRequest/HttpServletResponse. The `management.trace.include`
property can be used to change what aspects are logged.

Closes gh-3948
2015-10-14 13:25:11 -07:00
Phillip Webb
143536f72d Polish 2015-10-14 12:52:38 -07:00
Andy Wilkinson
81f876aac5 Exclude bean-validator from jersey-spring3 to avoid classpath pollution
jersey-spring3 has a transtive dependencies on HK2’s bean-validator
module that embeds JBoss Logging, Hibernate Validator, and Classmate
without repackaging them. This makes it impossible to control the
version of those three libraries that will be used without relying on
classpath ordering.

This commit excludes the bean-validator dependency from jersey-spring3.
The Jersey starter already depends on our Validation starter which
pulls in the proper, and controllable, version of the three
dependencies listed above so users of our starters will be unaffected.

Closes gh-4186
2015-10-14 20:36:43 +01:00
Andy Wilkinson
f770dbab52 Apply HttpMessageConverter auto-config to form part converters
Closes gh-3525
2015-10-14 17:36:04 +01:00
Andy Wilkinson
30f24eac0a Merge branch '1.2.x' 2015-10-14 16:33:55 +01:00
Andy Wilkinson
7e718cda26 Remove redundant hash from path of unpacked nested library
Closes gh-4124
2015-10-14 16:32:58 +01:00
Andy Wilkinson
7cd5622199 Merge branch '1.2.x' 2015-10-14 15:53:19 +01:00