Commit Graph

9305 Commits

Author SHA1 Message Date
Stephane Nicoll
f28fa3e1ab Merge branch '1.5.x' 2016-11-01 16:48:38 +01:00
Stephane Nicoll
a733c62689 Fix typo 2016-11-01 16:48:24 +01:00
Andy Wilkinson
d58c79d9b7 Merge branch '1.5.x' 2016-11-01 14:26:22 +00:00
Andy Wilkinson
20e8c36590 Merge branch '1.4.x' into 1.5.x 2016-11-01 14:26:18 +00:00
Andy Wilkinson
6828997651 Correct minimum recommended version of Gradle to be 2.9 rather than 2.8
Closes gh-7189
See gh-6884
2016-11-01 14:25:07 +00:00
Andy Wilkinson
05732613dd Update ConditionalOnJava and its usage now that Boot requires Java 8
Closes gh-6982
2016-11-01 14:18:33 +00:00
Andy Wilkinson
8026b2e7a0 Merge branch '1.5.x'
See gh-6982
2016-11-01 13:55:34 +00:00
Andy Wilkinson
fe50b2019e Merge branch '1.4.x' into 1.5.x 2016-11-01 13:52:51 +00:00
Andy Wilkinson
b191974faa Reflect Java 7/8 differences in javadoc for metric repository auto-config
Closes gh-6985
2016-11-01 13:51:46 +00:00
Andy Wilkinson
4e30da35ad Merge branch '1.5.x' 2016-11-01 13:48:37 +00:00
Andy Wilkinson
aeaaaaf903 Merge branch '1.4.x' into 1.5.x 2016-11-01 13:48:31 +00:00
Andy Wilkinson
ae4b8dc420 Ensure that CLI-based tests automatically import new TestRestTemplate
See gh-6973
2016-11-01 13:47:37 +00:00
Andy Wilkinson
14d58b49dd Merge branch '1.5.x' 2016-11-01 13:36:05 +00:00
Andy Wilkinson
8b631390ba Merge branch '1.4.x' into 1.5.x 2016-11-01 13:36:00 +00:00
Andy Wilkinson
307fd94b4f Correct typo in the documentation for RestTemplateBuilder customization
See gh-7054
2016-11-01 13:35:27 +00:00
Andy Wilkinson
f5d60c3c0a Merge branch '1.5.x' 2016-11-01 11:46:34 +00:00
Andy Wilkinson
f85535b697 Merge branch '1.4.x' into 1.5.x 2016-11-01 11:46:28 +00:00
Andy Wilkinson
fc0d4e45a5 Update CLI test auto-configuration to 1.4's new test infrastructure
Closes gh-6973
2016-11-01 11:36:48 +00:00
Andy Wilkinson
5bc8101725 Merge branch '1.5.x' 2016-11-01 11:07:01 +00:00
Andy Wilkinson
ffbbd2a5f8 Merge branch '1.4.x' into 1.5.x 2016-11-01 11:06:56 +00:00
Andy Wilkinson
be78dc4b99 Flesh out the documentation on RestTemplateBuilder customization
Closes gh-7054
2016-11-01 11:06:38 +00:00
Andy Wilkinson
473543056f Merge branch '1.5.x' 2016-11-01 10:36:36 +00:00
Andy Wilkinson
90cc322c5e Merge branch '1.4.x' into 1.5.x 2016-11-01 10:36:30 +00:00
Andy Wilkinson
4919c6f30c Ignore scoped targets when collecting servlet context initializer beans
Previously, there were two problems with servlet context initializer
beans that are a scoped proxy:

1. When there's no explicit registration bean the target of the scoped
   proxy is registered rather than the proxy. This meant that the
   proxy had no effect as it was being bypassed.
2. When there is an explicit registration bean, the registration is
   performed twice: the faulty implicit registration described above
   and explicit registration.

A fix (SPR-14816) has been made in Spring Framework so that we can
correctly determine the type of bean that will be produced by a
scoped proxy's factory bean. That change, coupled with the change in
this commit that ignored beans that are the target of a scoped proxy
addresses both of the problems described above. A single registration
is now performed and its the scoped proxy, rather than its target,
that is registered.

Closes gh-7150
2016-11-01 10:24:33 +00:00
Andy Wilkinson
1186eb3250 Merge branch '1.5.x' 2016-11-01 10:00:34 +00:00
Andy Wilkinson
9b6c9eeedd Merge branch '1.4.x' into 1.5.x 2016-11-01 10:00:16 +00:00
Andy Wilkinson
7e8c5f5940 Silence CLI dependency resolution progress reporting when run with -q
Closes gh-7247
2016-11-01 09:59:58 +00:00
Phillip Webb
98a3ae9ac4 Merge branch '1.5.x' 2016-10-31 23:13:37 -07:00
Phillip Webb
5b66ffbb4b Merge branch '1.4.x' into 1.5.x 2016-10-31 23:09:36 -07:00
Phillip Webb
f4328b41af Polish 2016-10-31 23:09:25 -07:00
Phillip Webb
1b17677e0b Polish TLD skip pattern support
See gh-5010
2016-10-31 23:09:24 -07:00
Phillip Webb
97fee46682 Revert Layout changes
This reverts commits:
- 974ec92ad6.
- 537e0c12c2.
- 500a3df6e9.
2016-10-31 21:08:15 -07:00
Phillip Webb
cecc1c8817 Disable DevTools property defaults in production
Update `DevToolsPropertyDefaultsPostProcessor` so that property defaults
are only added at development time. Properties are now added only when
`Restarter` is initialize or remote devtools is enabled.

Fixes gh-7014
2016-10-31 20:55:05 -07:00
Phillip Webb
c6657aaf12 Merge pull request #7066 from youngm/pidotherevents
* pr/7066:
  Support ApplicationReadyEvent from PidFileWriter
2016-10-31 16:37:08 -07:00
Mike Youngstrom
970dcc3fd3 Support ApplicationReadyEvent from PidFileWriter
Update `ApplicationPidFileWriter` to support `ApplicationReadyEvent` in
addition to the already supported `ApplicationEnvironmentPreparedEvent`
and `ApplicationPreparedEvent` events.

Closes gh-7066
Fixes gh-7027
2016-10-31 16:34:27 -07:00
Phillip Webb
5a3b881e1f Merge pull request #7217 from gdpotter/master
* pr/7217:
  Respect 'primary' flag when replacing databases
2016-10-31 16:27:09 -07:00
Greg Potter
39d5881bf2 Respect 'primary' flag when replacing databases
Update TestDatabaseAutoConfiguration to ensure that the the `primary`
flag of the `BeanDefinition` is copied.

Closes gh-7217
2016-10-31 16:26:41 -07:00
Phillip Webb
dbf6d3d418 Don't detect persistenceUnitRootLocation
Update JpaBaseConfiguration so that the persistenceUnitRootLocation is
no longer detected. The update to gh-7003 means that we can now rely on
the standard detection mechanism.

Fixes gh-6983
See gh-6635
2016-10-31 15:57:18 -07:00
Phillip Webb
60355e0e11 Fix ResourceHttpRequestHandler delegate
Fix ResourceHttpRequestHandler to set the ServletContext following the
Spring Framework update for SPR-14851.
2016-10-31 15:04:43 -07:00
Andy Wilkinson
cdcc3d2f28 Ensure getResources("") includes nested root URLs
Previously, if Boot's JarURLConnection pointed to the root of a nested
entry, e.g. /BOOT-INF/classes, a call to getInputStream() would throw
an IOException. This behavior is reasonable for a URL that points
to the root of a normal jar as the jar itself is on the class path
anyway. However, for a nested jar it meant that a call to
ClassLoader.getResources("") would not include URLs for any nested
jars and directories (/BOOT-INF/classes and jars in /BOOT-INF/lib).
This is due to some logic in URLClassPath.Loader.findResource that
verifies a URL by opening a connection and calling getInputStream().

The result of missing URLs for the root of nested jars and directories
is that classpath scanning that scans from the root (not a good idea
for performance reasons, but something that we should support) would
not find entries in /BOOT-INF/classes or in jars in /BOOT-INF/lib.

This commit updates our JarURLConnection so that it no longer throws
an IOException when asked for an InputStream for the root of a nested
entry (directory or jar).

Fixes gh-7003
2016-10-31 12:06:35 -07:00
Phillip Webb
57d5a2ebc6 Formatting 2016-10-31 11:41:45 -07:00
Stephane Nicoll
45a253b754 Merge branch '1.5.x' 2016-10-31 16:08:23 +01:00
Stephane Nicoll
9fc8d61107 Merge branch '1.4.x' into 1.5.x 2016-10-31 16:08:10 +01:00
Stephane Nicoll
49b244b121 Upgrade to H2 1.4.193
Closes gh-7256
2016-10-31 16:07:55 +01:00
Stephane Nicoll
d6239b1202 Merge branch '1.5.x' 2016-10-31 16:04:01 +01:00
Stephane Nicoll
9100897dcb Automatically exclude auto-configurations from component scan
Previously, if an auto-configuration class was (wrongly) located in a
candidate package for component scanning, the class was silently loaded
as an app configuration (i.e. with the wrong lifecycle).

This commit adds an `AutoConfigurationExcludeFilter` to
`@SpringBootApplication` so that such classes are automatically
filtered. Since they are registered in `spring.factories`, we can
silently ignore them since we know they'll be loaded later on.

Closes gh-7168
2016-10-31 15:13:58 +01:00
Stephane Nicoll
236f03c4bb Merge branch '1.5.x' 2016-10-31 11:38:54 +01:00
Stephane Nicoll
dc25478000 Merge pull request #7253 from izeye:typo-20161031
* pr/7253:
  Fix typo
2016-10-31 11:38:35 +01:00
Johnny Lim
7bb63238ab Fix typo
Closes gh-7253
2016-10-31 11:37:52 +01:00
Stephane Nicoll
d27ffd289a Merge branch '1.5.x' 2016-10-31 10:38:06 +01:00