Commit Graph

8996 Commits

Author SHA1 Message Date
Stephane Nicoll
ab2a2579c8 Polish contribution
Closes gh-6571
2016-10-10 11:37:21 +02:00
Aurélien Leboulanger
7efdb91641 Manage Tomcat queued connections
Adding two tomcat server properties:
- server.tomcat.accept-count
- server.tomcat.max-connections

Closes gh-6433
2016-10-10 11:37:12 +02:00
Stephane Nicoll
d5b2f67b5f Merge pull request #6543 from vpavic:database-initializers
* pr/6543:
  Polish contribution
  Improve database initializers
2016-10-10 10:43:29 +02:00
Stephane Nicoll
3e1425ebed Polish contribution
Closes gh-6543
2016-10-10 10:43:12 +02:00
Vedran Pavic
286a928347 Improve database initializers
This commit improves database initializers for Spring Batch and Spring
Session by introducing `AbstractDatabaseInitializer` which eliminates
duplicated logic in existing initializers. Additionally, database
platform resolution now relies on `DatabaseDriver`.

See gh-6543
2016-10-10 09:53:40 +02:00
Andy Wilkinson
d2d911ba94 Merge branch '1.4.x' into 1.5.x 2016-10-07 17:08:20 +01:00
Andy Wilkinson
a5b4c8e6db Make cycle clearer in bean currently in creation failure analysis
Note: the fully-qualified references to @Configuration in some of the
test configuration classes are required to work around a bug in javac.
1.8.0_102 (and earlier). Without them, compilation fails as it cannot
resolve the symbol despite the import statement and the unqualified
references working elsewhere in the same source file.

Closes gh-7056
2016-10-07 17:07:44 +01:00
Stephane Nicoll
98b30416ca Merge branch '1.4.x' into 1.5.x 2016-10-07 14:21:28 +02:00
Stephane Nicoll
9861cb7e9c Expand the note regarding LiveReload
See gh-7080
2016-10-07 14:21:12 +02:00
Stephane Nicoll
5435f03690 Merge branch '1.4.x' into 1.5.x 2016-10-07 14:15:19 +02:00
Stephane Nicoll
f2511cfa49 Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf
* pr/7127:
  Fix typo
2016-10-07 14:15:04 +02:00
Aurélien Leboulanger
2c64661b58 Fix typo
Closes gh-7127
2016-10-07 14:14:50 +02:00
Stephane Nicoll
ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy
Closes gh-7113
2016-10-07 10:35:48 +02:00
Stephane Nicoll
d57f3afdd3 Add XA datasource for Apache Derby
Closes gh-6823
2016-10-07 10:23:13 +02:00
Stephane Nicoll
02b0e3955c Merge branch '1.4.x' into 1.5.x 2016-10-07 09:46:21 +02:00
Stephane Nicoll
4a34c35da3 Merge pull request #7120 from izeye:fix-string-format
* pr/7120:
  Fix String.format() usages
2016-10-07 09:46:03 +02:00
Johnny Lim
1c4c0c6119 Fix String.format() usages
Closes gh-7120
2016-10-07 09:45:43 +02:00
Andy Wilkinson
9b6fa1e8d7 Separate conditions that did and did not match in auto-config endpoint
Closes gh-7122
2016-10-06 17:15:38 +01:00
Stephane Nicoll
c06dc33bf6 Generate deprecated meta-data for deprecated @Bean methods
This commit makes sure that a meta-data group exposed via a deprecated
`@Bean` method is deprecated as well. This also works if the class
in which the bean method is defined is itself deprecated.

Closes gh-7100
2016-10-06 17:08:49 +02:00
Andy Wilkinson
9b8f33df6d Merge branch '1.4.x' into 1.5.x 2016-10-06 15:53:07 +01:00
Andy Wilkinson
20a2db79bd Separate conditions that did and did not match in auto-config report
Closes gh-7098
2016-10-06 15:52:45 +01:00
Stephane Nicoll
0fe0ad4cfb Merge branch '1.4.x' into 1.5.x 2016-10-06 13:35:32 +02:00
Stephane Nicoll
668993c4bf Fix typo
Closes gh-7117
2016-10-06 13:35:21 +02:00
Stephane Nicoll
f82e91df39 Merge branch '1.4.x' into 1.5.x 2016-10-06 13:29:53 +02:00
Stephane Nicoll
cbb3418059 Merge pull request #7004 from master
* pr/7004:
  Polish contribution
  Allow configuration to specify randomly generated database name
2016-10-06 13:29:38 +02:00
Stephane Nicoll
03961e6692 Polish contribution
Closes gh-7004
2016-10-06 13:28:23 +02:00
Rob Fletcher
7fcb197092 Allow configuration to specify randomly generated database name
See gh-7004
2016-10-06 11:40:19 +02:00
Stephane Nicoll
f684bcc9e5 Merge branch '1.4.x' into 1.5.x 2016-10-06 11:37:20 +02:00
Stephane Nicoll
0f97ccf2fa Clarify dependency override instructions for Thymeleaf 3
Closes gh-7097
2016-10-06 11:21:24 +02:00
Stephane Nicoll
200e246238 Merge branch '1.4.x' into 1.5.x 2016-10-06 09:35:01 +02:00
Stephane Nicoll
e9f43f30df Merge pull request #7111 from izeye:string-format
* pr/7111:
  Remove unused parameters in String.format()
2016-10-06 09:34:45 +02:00
Johnny Lim
91254f2110 Remove unused parameters in String.format()
Closes gh-7111
2016-10-06 09:34:32 +02:00
Andy Wilkinson
31e6819a6c Merge branch '1.4.x' into 1.5.x 2016-10-05 17:03:27 +01:00
Andy Wilkinson
97cf2e9677 Polish new tests for the Gradle plugin's deprecated ID
The output capture for the deprecation warning only appears to work
when the test is run in isolation. I can't figure out why that's the
case, particularly as we have another test class
(BootRunResourceTests) that uses OutputCapture and works reliably.

I'm cutting my loses and removing the use of OutputCapture and the
assertion that the warnings is logged.

See gh-6997
2016-10-05 16:54:37 +01:00
Andy Wilkinson
fe10ea73b0 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:58:42 +01:00
Andy Wilkinson
ad3e5c04bb Add a second, portal-compatible ID to the Gradle plugin
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.

This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.

Closes gh-6997
2016-10-05 14:58:26 +01:00
Stephane Nicoll
cf28663cd7 Deprecate commons-dbcp 1
Closes gh-6787
2016-10-05 15:21:09 +02:00
Stephane Nicoll
0b9283c3cd Merge pull request #6367 from henrikerola:gh-6351
* pr/6367:
  Polish contribution
  "spring war" should copy resources to WEB-INF/classes
2016-10-05 13:48:37 +02:00
Stephane Nicoll
2d75cc79c0 Polish contribution
Closes gh-6367
2016-10-05 13:47:50 +02:00
Henri Kerola
d07f689446 "spring war" should copy resources to WEB-INF/classes
Closes gh-6351
2016-10-05 13:36:25 +02:00
Stephane Nicoll
07690bab25 Allow customization of the auto-configured JmsTemplate
Closes gh-6825
2016-10-04 15:00:42 +02:00
Stephane Nicoll
4b2970606e Merge branch '1.4.x' into 1.5.x 2016-10-04 13:37:57 +02:00
Stephane Nicoll
7019894f0e Clarify the role of spring-boot-starter-cache
The cache abstraction is a core feature of the Spring Framework. Basic
features such as `@EnableCaching` are therefore available by default with
no extra dependencies necessary.

However, the actual cache adapters for JCache, Ehcache 2.x, Caffeine and
Guava are located in a separated module, `spring-context-support`. Spring
Boot provides that artifact via the `spring-boot-starter-cache` starter.

It is quite easy to "only" add the cache library dependencies and forget
about this extra dependencies since `@EnableCaching` is available by
default. This commit clarifies the role of the starer in each section so
that it is more obvious. We're already explaining this at the beginning
of the section but it seems that's not enough.

Closes gh-7071
2016-10-04 13:37:29 +02:00
Stephane Nicoll
d0e49cc413 Merge branch '1.4.x' into 1.5.x 2016-10-04 13:05:18 +02:00
Stephane Nicoll
8d2aedc5a8 Merge branch '1.3.x' into 1.4.x 2016-10-04 13:05:01 +02:00
Stephane Nicoll
7f1118b87a Merge pull request #7073 from garyrussell:si4210
* pr/7073:
  Upgrade to Spring Integration 4.2.11
2016-10-04 13:04:39 +02:00
Gary Russell
0ffc7dc13f Upgrade to Spring Integration 4.2.11
Closes gh-7073
2016-10-04 13:04:15 +02:00
Stephane Nicoll
58050fb72f Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-dependencies/pom.xml
2016-10-04 13:01:46 +02:00
Stephane Nicoll
dcb3f31901 Merge pull request #7074 from garyrussell:si433-14
* pr/7074:
  Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
2016-10-04 13:00:05 +02:00
Gary Russell
ad3179b9ee Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
Closes gh-7074
2016-10-04 12:59:41 +02:00