Phillip Webb
99e72664d9
Polish spring transaction manager properties
...
Polish and update contribution so that TransactionManager properties can
be defined per technology, rather than globally.
Closes gh-7561
2016-12-20 17:59:19 -08:00
Lucas Saldanha
534a9db6fd
Make stop wait time in the launch script configurable
...
Create a parameter `STOP_WAIT_TIME` for the startup script
that configures the time in seconds to wait for a normal
shutdown. Because of #4941 we also send a shutdown half
way the countdown.
Fixes gh-7121
2016-12-20 15:15:12 -08:00
Stephane Nicoll
998ff2feee
Merge branch '1.5.x'
2016-12-20 11:59:32 +01:00
Stephane Nicoll
851ce2286f
Allow to override Couchbase's CustomConversions
...
Closes gh-7700
2016-12-20 11:59:16 +01:00
Phillip Webb
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
Phillip Webb
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
Phillip Webb
bd74c3d327
Polish formatting
2016-12-19 12:25:09 -08:00
Phillip Webb
e578ace7d7
Polish doc formatting
2016-12-19 10:29:42 -08:00
Stephane Nicoll
f03da0b4f7
Merge branch '1.5.x'
2016-12-19 16:00:19 +01:00
Stephane Nicoll
9668006aea
Merge branch '1.4.x' into 1.5.x
2016-12-19 16:00:04 +01:00
Stephane Nicoll
3237e4ab3e
Add link between reference and how-to
...
See gh-7652
2016-12-19 15:59:49 +01:00
Stephane Nicoll
90658c5274
Merge branch '1.5.x'
2016-12-16 14:52:28 +01:00
Stephane Nicoll
f46bd35a60
Merge branch '1.4.x' into 1.5.x
2016-12-16 14:52:16 +01:00
Stephane Nicoll
69dce2881b
Remove outdated (and duplicated) section
...
Closes gh-7667
2016-12-16 14:52:05 +01:00
Stephane Nicoll
e3496614be
Merge branch '1.5.x'
2016-12-16 10:53:53 +01:00
Stephane Nicoll
21b815aabd
Polish contribution
...
Closes gh-7560
2016-12-16 10:52:43 +01:00
Andy Wilkinson
943262bb97
Raise the minimum supported version of Hibernate to 5.2.x
...
Closes gh-7586
2016-12-15 21:31:53 +00:00
Andy Wilkinson
1782d778db
Merge branch '1.5.x'
2016-12-15 20:07:55 +00:00
Andy Wilkinson
6fb1fb580d
Upgrade to Dependency Management Plugin 1.0.0.RC1
...
Closes gh-7636
2016-12-15 20:07:35 +00:00
Brian Clozel
5331c41b6d
Merge branch '1.5.x'
2016-12-15 17:19:59 +01:00
Brian Clozel
4e9abbbc25
Merge branch '1.4.x' into 1.5.x
2016-12-15 17:18:18 +01:00
Brian Clozel
37605e3576
Document devtools influence on HTTP cache headers
...
This commits documents the fact that, amongst its property defaults,
devtools is disabling the HTTP cache headers when serving static
resources with Spring MVC.
Fixes gh-7516
2016-12-15 17:14:19 +01:00
Stephane Nicoll
1302d1b0e4
Merge branch '1.5.x'
2016-12-15 14:16:28 +01:00
Alessandro Falappa
dd7d81a580
INIT INFO Required Start/Stop as embedded launch script properties
...
Expose the Required-Start and Require-Stop lines in the launch script
INIT INFO section as customizable embedded launch script properties.
This way one can express dependencies fron other init services by simply
changing the configuration in the build script.
Closes gh-7555
2016-12-15 14:14:50 +01:00
Stephane Nicoll
0ea3277769
Merge branch '1.5.x'
2016-12-15 09:21:24 +01:00
Stephane Nicoll
0fbe56eabc
Merge branch '1.4.x' into 1.5.x
2016-12-15 09:21:11 +01:00
Stephane Nicoll
c8bdf74327
Expand ConfigurationProperties doc
...
Closes gh-7620
2016-12-15 09:20:24 +01:00
Stephane Nicoll
a86678cc31
Merge branch '1.5.x'
2016-12-14 19:33:34 +01:00
Stephane Nicoll
703ed901fe
Polish doc
2016-12-14 19:19:19 +01:00
Stephane Nicoll
e5f2c58a7a
Polish
...
Closes gh-7632
2016-12-14 19:18:36 +01:00
Stephane Nicoll
5b636a00b7
Merge branch '1.5.x'
2016-12-14 19:09:33 +01:00
Stephane Nicoll
e002e03b3e
Merge branch '1.4.x' into 1.5.x
2016-12-14 19:09:18 +01:00
Johannes Harth
9746c63209
Update production-ready-features.adoc
...
Replace line break with missing line fold "\\\n" to continue the property
value.
Closes gh-7596
2016-12-14 19:06:39 +01:00
Stephane Nicoll
fa492e3ac8
Merge branch '1.5.x'
2016-12-08 15:58:12 +01:00
Stephane Nicoll
8a50dae01a
Add missing entry for `server.tomcat.accesslog.buffered`
...
See gh-7456
2016-12-08 15:57:44 +01:00
Stephane Nicoll
816c236e5b
Merge branch '1.5.x'
2016-12-01 16:28:29 +01:00
Stephane Nicoll
ee72e788ed
Rename `spring-boot-junit-runners` to `spring-boot-test-support`
...
Closes gh-7421
2016-12-01 16:25:47 +01:00
Andy Wilkinson
f454adca1a
Merge branch '1.4.x' into 1.5.x
2016-12-01 14:47:44 +00:00
Andy Wilkinson
d9bd211062
Link to correct branch on GitHub from snapshot documentation
...
Closes gh-7548
2016-12-01 14:46:39 +00:00
Andy Wilkinson
995b962807
Merge branch '1.5.x'
2016-12-01 14:37:19 +00:00
Andy Wilkinson
8494635a05
Merge branch '1.4.x' into 1.5.x
2016-12-01 14:37:10 +00:00
Andy Wilkinson
b798b5a40b
Update docs to reflect Gradle plugin being available in the Plugin Portal
...
Closes gh-1567
2016-12-01 14:37:01 +00:00
Stephane Nicoll
ede0b0f940
Merge branch '1.5.x'
2016-12-01 14:55:15 +01:00
Stephane Nicoll
c127c1fdf9
Polish doc
...
Closes gh-7381
2016-12-01 14:54:54 +01:00
Andy Wilkinson
9f1e90d3c0
Merge branch '1.4.x' into 1.5.x
2016-12-01 13:30:25 +00:00
Andy Wilkinson
36981259a5
Document that CRaSH commands written in Java are not supported
...
Closes gh-7471
2016-12-01 13:29:49 +00:00
Stephane Nicoll
a4770f90dc
Merge branch '1.5.x'
2016-12-01 11:53:52 +01:00
Stephane Nicoll
2c630b5c61
Validate schema and data resources
...
Previously, if a user specifies a path to a schema or data DDL that does
not exist, the application will start up fine and the missing DDL would
not be reported.
This commit validates that user-defined resources actually exist and
throw a new `ResourceNotFoundException` if they don't.
Closes gh-7088
2016-12-01 11:52:52 +01:00
Stephane Nicoll
2dbebf67e8
Merge branch '1.5.x'
2016-11-30 10:56:14 +01:00
Stephane Nicoll
7c02daabc3
Polish contribution
...
Closes gh-7533
2016-11-30 10:55:32 +01:00
Johnny Lim
c654eff41b
Update doc for spring.data.neo4j.open-in-view
...
See gh-7533
2016-11-30 10:42:18 +01:00
Stephane Nicoll
0568afc6cb
Merge branch '1.5.x'
2016-11-30 08:31:41 +01:00
Johnny Lim
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
Stephane Nicoll
bfa0514acb
Merge branch '1.5.x'
2016-11-29 17:01:37 +01:00
Johnny Lim
d373de903b
Fix broken doc formatting
...
Closes gh-7522
2016-11-29 17:00:02 +01:00
Stephane Nicoll
2577d79ff1
Merge branch '1.5.x'
2016-11-29 14:54:38 +01:00
Stephane Nicoll
b618c70e52
Add test slice for pure jdbc tests
...
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.
Closes gh-6563
2016-11-29 14:54:15 +01:00
Stephane Nicoll
e8d476dbca
Fix use of `forceCreation` flag in `maven-jar-plugin`
2016-11-29 11:28:14 +01:00
Phillip Webb
450ab28163
Merge branch '1.5.x'
2016-11-28 17:27:05 -08:00
Dave Syer
c6c6524b40
Support custom fat jar layouts
...
Allow support for custom Lyout implementations with both the Maven
and Gradle plugin. Implementations of `LayoutFactory` can now be
specified to allow customization of the layout. In addition a
layout may now implement `CustomLoaderLayout` if it wishes to
write custom loader classes.
See gh-7263
2016-11-28 16:31:53 -08:00
Andy Wilkinson
4c01e940ea
Merge branch '1.5.x'
2016-11-28 11:33:13 +00:00
Andy Wilkinson
50c39661ad
Merge branch '1.4.x' into 1.5.x
2016-11-28 11:33:00 +00:00
Andy Wilkinson
491bd745de
Document Jersey's package scanning limitations
...
Closes gh-7496
2016-11-28 11:32:48 +00:00
Andy Wilkinson
4a10cfe112
Merge branch '1.5.x'
2016-11-25 10:24:43 +00:00
Phillip Johnson
f64d5303cf
Document and test array support for spring.profiles.*
...
Closes gh-7175
Closes gh-6995
2016-11-25 10:24:14 +00:00
Stephane Nicoll
f260cd9a07
Merge branch '1.5.x'
2016-11-25 10:10:17 +01:00
Stephane Nicoll
0befc310cd
Add dedicated settings for maxHttpPostSize
...
This commit deprecates `server.max-http-post-size` and introduces a
dedicated property for each supported container. In particular, Undertow
can now define a max size higher than 2GB.
Closes gh-7362
2016-11-25 09:54:10 +01:00
Stephane Nicoll
3bfbbeb9f4
Merge branch '1.5.x'
2016-11-24 17:44:17 +01:00
Stephane Nicoll
22208f6a9e
Auto-configure validation constraints on bean methods
...
This commit auto-configures `MethodValidationPostProcessor` if necessary
when a JSR-303 validator implementation is detected on the classpath.
Closes gh-6228
2016-11-24 17:40:33 +01:00
Stephane Nicoll
e687d3aeba
Merge branch '1.5.x'
2016-11-24 10:40:08 +01:00
Stephane Nicoll
c9fa1a1f70
Merge branch '1.4.x' into 1.5.x
2016-11-24 10:39:51 +01:00
Stephane Nicoll
0359b2f6f5
Document how to disable JMS transacted session
...
Closes gh-7463
2016-11-24 10:39:40 +01:00
Stephane Nicoll
2f57e1885a
Merge branch '1.5.x'
2016-11-23 14:40:29 +01:00
Stephane Nicoll
ea023618a4
Polish upgrade to Spring Session 1.3.0.RC1
...
Closes gh-7457
2016-11-23 14:39:56 +01:00
Vedran Pavic
ffec6fddd2
Upgrade Spring Session to 1.3.0.RC1
...
See gh-7457
2016-11-23 14:39:56 +01:00
Phillip Webb
ab3a001286
Merge branch '1.5.x'
2016-11-22 15:49:27 -08:00
Phillip Webb
dc237043b8
Merge branch '1.4.x' into 1.5.x
2016-11-22 15:48:52 -08:00
Phillip Webb
74670cb20f
Allow WebDriver beans to define their own scope
...
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.
Fixes gh-7454
2016-11-22 15:48:28 -08:00
Phillip Webb
e0dfff2b23
Merge branch '1.5.x'
2016-11-22 14:54:17 -08:00
Phillip Webb
b6b8bef009
Polish
2016-11-22 14:51:56 -08:00
Andy Wilkinson
bc6b2a9c75
Merge branch '1.5.x'
2016-11-22 13:54:49 +00:00
Christian Koops
5c11059e1d
Make launch script's logFilename and pidFilename configurable via properties
...
Closes gh-7234
2016-11-22 13:54:16 +00:00
Andy Wilkinson
fd2b417252
Merge branch '1.5.x'
2016-11-22 13:10:01 +00:00
Andy Wilkinson
d12c21ae2f
Add spring-kafka dependency to spring-boot-docs for Javadoc links
...
See gh-6961
2016-11-22 13:09:15 +00:00
Stephane Nicoll
e3688455fa
Merge branch '1.5.x'
2016-11-22 10:30:31 +01:00
Stephane Nicoll
642af52d01
Polish "Apache Kafka support" contribution
...
Closes gh-6961
2016-11-22 10:22:00 +01:00
Gary Russell
c4188c8e4a
Add Apache Kafka support
...
See gh-6961
2016-11-22 09:34:01 +01:00
Phillip Webb
20d7dd5747
Merge branch '1.5.x'
2016-11-18 17:30:03 -08:00
Phillip Webb
1657120286
Move ModifiedClassPathRunner to its own module
...
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.
Fixes gh-7420
2016-11-18 17:27:54 -08:00
Andy Wilkinson
9273b1789b
Merge branch '1.5.x'
2016-11-18 16:41:22 +00:00
Andy Wilkinson
1cd781b242
Make spring-boot-test compatible with Mockito 2.1 and 2.2
...
We use some internal Mockito classes and some breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.
To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.
Closes gh-6520
2016-11-18 16:39:44 +00:00
Stephane Nicoll
7ebe324514
Merge branch '1.5.x'
2016-11-18 11:58:17 +09:00
Stephane Nicoll
2ba3b27954
Merge branch '1.4.x' into 1.5.x
...
# Conflicts:
# spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
# spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
2016-11-18 11:56:22 +09:00
Stephane Nicoll
0072a93915
Expose Tomcat's accesslog requestAttributesEnabled
...
This commit adds an extra property to the `server.tomcat.accesslog` to
control the `reqestAttributesEnabled` flag. This flag sets request
attributes for IP address, Hostname, protocol and port used for the
request.
Closes gh-7367
2016-11-18 11:48:09 +09:00
Stephane Nicoll
22edb9eded
Merge branch '1.5.x'
2016-11-17 14:45:07 +09:00
Stephane Nicoll
7b742fd792
Polish
...
See gh-7357
2016-11-17 14:44:40 +09:00
Phillip Webb
cb7c0b5031
Merge branch '1.5.x'
2016-11-16 16:06:53 -08:00
Christoffer Sawicki
d7bbea63b7
Add properties for content security policy
...
Add `content-security-policy` and `content-security-policy-mode`
`security.header` properties and update auto-configuration to apply
them when specified.
Fixes gh-7373
Closes gh-7357
2016-11-16 15:30:36 -08:00
Johnny Lim
8038882d46
Polish
...
Closes gh-7403
2016-11-16 13:36:51 -08:00
Phillip Webb
d8b7d6dfdc
Merge branch '1.5.x'
2016-11-15 18:53:54 -08:00