Commit Graph

50613 Commits

Author SHA1 Message Date
Phillip Webb
b225b7f33a Rename EnableAutoConfigurationImportSelector
Rename EnableAutoConfigurationImportSelector to the more general
AutoConfigurationImportSelector since it's now used for more than
just the enable annotation.

The existing EnableAutoConfigurationImportSelector class remains in
a deprecated form so that it can be made package-private again in
Spring Boot 2.0.

Fixes gh-8072
2017-01-23 17:33:02 -08:00
Phillip Webb
2c89d9918f Relocate AutoConfigurations from root package
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.

Fixes gh-8071
2017-01-23 17:32:45 -08:00
Phillip Webb
3893383cbe Merge branch '1.5.x' 2017-01-23 16:40:30 -08:00
Phillip Webb
5703fb1515 Polish 2017-01-23 16:03:59 -08:00
Stephane Nicoll
d1727f25e2 Merge branch '1.5.x' 2017-01-23 13:53:28 +01:00
Stephane Nicoll
f36b051071 Deprecate exceptionIfInvalid for yaml processing
See gh-8027
2017-01-23 13:47:09 +01:00
Stephane Nicoll
0286128b28 Deprecate exceptionIfInvalid
This commit deprecates the `exceptionIfInvalid` feature as we have now a
way to select the `@ConfigurationProperties` object to validate (i.e. add
`@Validated` on them).

Closes gh-8027
2017-01-23 13:29:26 +01:00
Andy Wilkinson
d7ea15a95d Merge branch '1.5.x' 2017-01-23 11:27:37 +00:00
Andy Wilkinson
393cfe505e Allow spring.profiles.include to be used anywhere to add active profiles
Previously, spring.profiles.include was only considered when it was
used in a configuration file. It was ignored in any other property
source.

This commit updates ConfigFileApplicationListener so that
spring.profiles.include can be used in any property source to add to
the profiles that have been declared active via
spring.profiles.active.

Closes gh-7668
2017-01-23 11:27:15 +00:00
Andy Wilkinson
863d505994 Merge branch '1.5.x' 2017-01-23 11:09:28 +00:00
Andy Wilkinson
07d9c3fef6 Rename classes and package in new OAuth2 and Actuator sample
Closes gh-8058
2017-01-23 11:08:05 +00:00
Andy Wilkinson
a7ee2b8e0e Merge branch '1.5.x' 2017-01-23 10:23:13 +00:00
Andy Wilkinson
0067082eac Document a warning about embedded Tomcat and tmpwatch on CentOS
Closes gh-5009
2017-01-23 10:22:51 +00:00
Andy Wilkinson
c543101dc1 Merge branch '1.5.x' 2017-01-23 10:10:59 +00:00
Andy Wilkinson
9a79d32f4c Polishing 2017-01-23 10:10:45 +00:00
Andy Wilkinson
1f183bd320 Merge branch '1.5.x' 2017-01-23 10:00:50 +00:00
Andy Wilkinson
68fdd49a0b Document payload types of messages sent to metricsChannel
Closes gh-7790
2017-01-23 10:00:42 +00:00
Andy Wilkinson
79bf7d473c Merge branch '1.5.x' 2017-01-23 09:48:44 +00:00
Andy Wilkinson
c86b844477 Remove @Component from ResourceServerFilterChainOrderProcessor
Closes gh-8050
2017-01-23 09:48:21 +00:00
Stephane Nicoll
b05df504ef Merge branch '1.5.x' 2017-01-22 11:15:16 +01:00
Stephane Nicoll
a15cb26278 Merge branch '1.4.x' into 1.5.x 2017-01-22 11:14:40 +01:00
Stephane Nicoll
4760a1a6e1 Merge pull request #8057 from izeye:fix-test-20170122
* pr/8057:
  Fix entry in broken-initialization.factories
2017-01-22 11:14:23 +01:00
Johnny Lim
752b8bd650 Fix entry in broken-initialization.factories
Closes gh-8057
2017-01-22 11:14:12 +01:00
Stephane Nicoll
09eb12c9a3 Merge branch '1.5.x' 2017-01-22 11:08:54 +01:00
Stephane Nicoll
012f3d3509 Upgrade to Spring LDAP 2.3.1.RELEASE
Closes gh-8055
2017-01-22 11:08:33 +01:00
Andy Wilkinson
d4c4bc35fd Start building against Spring Data Kay snapshots
See gh-7461
2017-01-20 21:16:38 +00:00
Andy Wilkinson
0acfee44c5 Start building against Spring Session 2.0 snapshots
See gh-8049
2017-01-20 19:45:11 +00:00
Andy Wilkinson
6d14a9dc78 Merge branch '1.5.x' 2017-01-20 16:52:53 +00:00
Andy Wilkinson
080ff49c8d Prevent AspectJ from loading aspects too early
Previously, AspectJ would find META-INF/aop.xml almost as soon as
the jar was launched, and before LaunchedURLClassLoader had been
created. This meant that AspectJ would attempt to load aspects listed
in META-INF/aop.xml but that were package in BOOT-INF/classes and,
therefore, could not be loaded.

This commit updates the Repackager so that a META-INF/aop.xml file
is moved into BOOT-INF/classes. This ensures that it isn't visible
to the app class loader so it won't be loaded to early. It will
now be loaded by LaunchedURLClassLoader which can also load the
compiled aspects that aop.xml references.

Closes gh-7587
2017-01-20 16:51:51 +00:00
Andy Wilkinson
258595e162 Merge branch '1.5.x' 2017-01-20 16:40:12 +00:00
Andy Wilkinson
a30fe9d9ff Update ServerPropertiesTests to tolerate changes in Tomcat 8.5.11
Closes gh-7360
2017-01-20 16:39:00 +00:00
Andy Wilkinson
fd677af868 Merge branch '1.5.x' 2017-01-20 16:25:14 +00:00
Andy Wilkinson
b71baf2c38 Support @ContextHierarchy when using @SpringBootTest
Closes gh-8000
2017-01-20 16:24:42 +00:00
Andy Wilkinson
eb4329fb39 Merge branch '1.5.x' 2017-01-20 15:54:04 +00:00
Andy Wilkinson
0ad4e0e70f Merge branch '1.4.x' into 1.5.x 2017-01-20 15:53:53 +00:00
Andy Wilkinson
9e2e824098 Upgrade to Tomcat 8.5.11
Closes gh-7360
2017-01-20 15:51:18 +00:00
Andy Wilkinson
d5a4058862 Merge branch '1.5.x' 2017-01-20 15:45:34 +00:00
Andy Wilkinson
bfd319755c Merge branch '1.4.x' into 1.5.x 2017-01-20 15:45:23 +00:00
Andy Wilkinson
0ce7c9516a Document how to configure test- and profile-specific Flyway migrations
Closes gh-2753
2017-01-20 15:44:42 +00:00
Stephane Nicoll
4fe04178b7 Merge branch '1.5.x' 2017-01-20 16:43:21 +01:00
Stephane Nicoll
45b93f3223 Merge pull request #8047 from eddumelendez:gh-7965
* pr/8047:
  Upgrade to Spring LDAP 2.3.0.RELEASE
2017-01-20 16:43:04 +01:00
Eddú Meléndez
5b57beca57 Upgrade to Spring LDAP 2.3.0.RELEASE
Closes gh-8047
2017-01-20 16:42:20 +01:00
Stephane Nicoll
fbae14da5d Merge pull request #7600 from michael-simons:DataMongoTest
* pr/7600:
  Polish contribution
  Add slide test annotation for MongoDB
2017-01-20 16:41:08 +01:00
Stephane Nicoll
915c959a28 Polish contribution
Closes gh-7600
2017-01-20 16:40:48 +01:00
Michael J. Simons
8648520876 Add slide test annotation for MongoDB
This commits adds a slice test infrastructure for MongoDB, similar to
what `@DataJpaTest` does with JPA.

By default, an embedded Mongod process is used if available.

See gh-7600
2017-01-20 16:40:47 +01:00
Stephane Nicoll
b19d31e067 Use a random port with embedded Mongo by default
This commit improves the logic of the embedded Mongo support to use a
random port if no custom port has been specified. This doesn't change
the default if the embedded support isn't active.

Closes gh-8044
2017-01-20 16:40:06 +01:00
Andy Wilkinson
65fe405f19 Merge branch '1.5.x' 2017-01-20 15:32:09 +00:00
Andy Wilkinson
b900a3efc8 Update Actuator endpoints to use custom media type
Previously, the actuator's endpoints produced application/json and,
where appropriate, also consumed application/json. Without a custom,
versioned media type, it's impossible for us to make changes to the
endpoints without breaking clients.

This commit introduces a new media type,
application/spring-boot.actuator.v1+json, that is now produced by
default with application/json also being produced if requested.
Endpoints that consume JSON will now also accept content the uses
the new media type in addition to application/json.

Closes gh-7967
2017-01-20 15:31:22 +00:00
Stephane Nicoll
2b71c22e0b Merge branch '1.5.x' 2017-01-20 10:54:54 +01:00
Stephane Nicoll
bed545df64 Merge branch '1.4.x' into 1.5.x 2017-01-20 10:54:32 +01:00