Commit Graph

10537 Commits

Author SHA1 Message Date
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
Stephane Nicoll 93bc34c1eb Merge pull request #8039 from rafael-rollo:master
* pr/8039:
  Indenting SpringApplication javadoc code
2017-01-20 10:54:10 +01:00
Rafael Rollo 6fba1381c1 Indenting SpringApplication javadoc code
Closes gh-8039
2017-01-20 10:53:34 +01:00
Stephane Nicoll 2c5c539bf1 Document automatic scheduling of metrics export
Closes gh-8040
2017-01-20 10:52:55 +01:00
Stephane Nicoll e093f2cc96 Merge branch '1.5.x' 2017-01-20 10:17:48 +01:00
Stephane Nicoll 079bbfb720 Merge pull request #8038 from artembilan:Spring_AMQP_1.7.0
* pr/8038:
  Upgrade to Spring AMQP 1.7.0.RELEASE
2017-01-20 10:17:13 +01:00
Artem Bilan 00f3ed348e Upgrade to Spring AMQP 1.7.0.RELEASE
Closes gh-8038
2017-01-20 10:16:40 +01:00
Stephane Nicoll 9213245b70 Merge branch '1.4.x' into 1.5.x 2017-01-20 10:15:50 +01:00
Stephane Nicoll d9a0a55245 Upgrade to Spring AMQP 1.6.7.RELEASE
Closes gh-8033
2017-01-20 10:15:19 +01:00
Phillip Webb 89f7ec054f Merge branch '1.5.x' 2017-01-19 12:45:26 -08:00
Phillip Webb f3cd0ad22c Polish 2017-01-19 12:44:57 -08:00
Phillip Webb 655fa59db0 Merge branch '1.4.x' into 1.5.x 2017-01-19 12:33:42 -08:00
Phillip Webb b05bdbfe4f Polish 2017-01-19 12:31:43 -08:00
Madhura Bhave e73c6bb2e2 Exclude authorization header from trace by default
Closes gh-7974
2017-01-19 12:12:09 -08:00
Madhura Bhave a5a382b8b1 Set AccessTokenConverter if available
Fixes gh-7091
2017-01-19 11:49:54 -08:00
Stephane Nicoll 7253bb334c Merge branch '1.5.x' 2017-01-19 16:47:21 +01:00
Stephane Nicoll e5e497ec3a Document `@ImportAutoConfiguration#exclude`
Closes gh-7862
2017-01-19 16:47:07 +01:00
Stephane Nicoll 03afa0b7b9 Merge branch '1.5.x' 2017-01-19 16:36:21 +01:00
Stephane Nicoll e44b595c0d Fix merge issue 2017-01-19 16:36:00 +01:00
Andy Wilkinson b113ba5e70 Merge branch '1.5.x' 2017-01-19 15:27:55 +00:00
Andy Wilkinson 84edf0167f Merge branch '1.4.x' into 1.5.x 2017-01-19 15:27:45 +00:00
Andy Wilkinson e04ace89b9 Fix LinkageError with ExpectedException and FilteredClassPathRunner
Previously, when the ExpectedException JUnit rule was used with
FilteredClassPathRunner a LinkageError would occur if any of
ExpectedException's methods that take a Hamcrest Matcher were called.
This was due to the FilteredClassLoader delegating loading of
org.junit classes to its parent but not org.hamcrest classes. This
resulted in JUnit classes loading one version of the Hamcrest class
and the test class loading another.

This commit ensures that both the JUnit classes and the test class
use the same version of Hamcrest classes by also delegating the
loading of org.hamcrest classes to FilteredClassLoader's parent.
2017-01-19 15:27:18 +00:00
Stephane Nicoll 43a4f0d49e Merge branch '1.5.x' 2017-01-19 16:20:09 +01:00
Stephane Nicoll ecafd384b7 Merge branch '1.4.x' into 1.5.x 2017-01-19 16:19:53 +01:00
Stephane Nicoll 9a9c4c75bf Merge pull request #8030 from michael-simons:fix-appendix-b
* pr/8030:
  Fix closing parentheses
2017-01-19 16:19:40 +01:00
Michael J. Simons a852c49edd Fix closing parentheses
Closes gh-8030
2017-01-19 16:19:07 +01:00
Stephane Nicoll b29e296383 Merge branch '1.5.x' 2017-01-19 16:15:03 +01:00