Commit Graph

10743 Commits (77b5c63ec03b415590cac3d8a717bc5e03bad901)
 

Author SHA1 Message Date
Stephane Nicoll a15cb26278 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4760a1a6e1 Merge pull request #8057 from izeye:fix-test-20170122
* pr/8057:
  Fix entry in broken-initialization.factories
8 years ago
Johnny Lim 752b8bd650 Fix entry in broken-initialization.factories
Closes gh-8057
8 years ago
Stephane Nicoll 09eb12c9a3 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 012f3d3509 Upgrade to Spring LDAP 2.3.1.RELEASE
Closes gh-8055
8 years ago
Andy Wilkinson d4c4bc35fd Start building against Spring Data Kay snapshots
See gh-7461
8 years ago
Andy Wilkinson 0acfee44c5 Start building against Spring Session 2.0 snapshots
See gh-8049
8 years ago
Andy Wilkinson 6d14a9dc78 Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson 258595e162 Merge branch '1.5.x' 8 years ago
Andy Wilkinson a30fe9d9ff Update ServerPropertiesTests to tolerate changes in Tomcat 8.5.11
Closes gh-7360
8 years ago
Andy Wilkinson fd677af868 Merge branch '1.5.x' 8 years ago
Andy Wilkinson b71baf2c38 Support @ContextHierarchy when using @SpringBootTest
Closes gh-8000
8 years ago
Andy Wilkinson eb4329fb39 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 0ad4e0e70f Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 9e2e824098 Upgrade to Tomcat 8.5.11
Closes gh-7360
8 years ago
Andy Wilkinson d5a4058862 Merge branch '1.5.x' 8 years ago
Andy Wilkinson bfd319755c Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 0ce7c9516a Document how to configure test- and profile-specific Flyway migrations
Closes gh-2753
8 years ago
Stephane Nicoll 4fe04178b7 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 45b93f3223 Merge pull request #8047 from eddumelendez:gh-7965
* pr/8047:
  Upgrade to Spring LDAP 2.3.0.RELEASE
8 years ago
Eddú Meléndez 5b57beca57 Upgrade to Spring LDAP 2.3.0.RELEASE
Closes gh-8047
8 years ago
Stephane Nicoll fbae14da5d Merge pull request #7600 from michael-simons:DataMongoTest
* pr/7600:
  Polish contribution
  Add slide test annotation for MongoDB
8 years ago
Stephane Nicoll 915c959a28 Polish contribution
Closes gh-7600
8 years ago
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
8 years ago
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
8 years ago
Andy Wilkinson 65fe405f19 Merge branch '1.5.x' 8 years ago
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
8 years ago
Stephane Nicoll 2b71c22e0b Merge branch '1.5.x' 8 years ago
Stephane Nicoll bed545df64 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 93bc34c1eb Merge pull request #8039 from rafael-rollo:master
* pr/8039:
  Indenting SpringApplication javadoc code
8 years ago
Rafael Rollo 6fba1381c1 Indenting SpringApplication javadoc code
Closes gh-8039
8 years ago
Stephane Nicoll 2c5c539bf1 Document automatic scheduling of metrics export
Closes gh-8040
8 years ago
Stephane Nicoll e093f2cc96 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 079bbfb720 Merge pull request #8038 from artembilan:Spring_AMQP_1.7.0
* pr/8038:
  Upgrade to Spring AMQP 1.7.0.RELEASE
8 years ago
Artem Bilan 00f3ed348e Upgrade to Spring AMQP 1.7.0.RELEASE
Closes gh-8038
8 years ago
Stephane Nicoll 9213245b70 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll d9a0a55245 Upgrade to Spring AMQP 1.6.7.RELEASE
Closes gh-8033
8 years ago
Phillip Webb 89f7ec054f Merge branch '1.5.x' 8 years ago
Phillip Webb f3cd0ad22c Polish 8 years ago
Phillip Webb 655fa59db0 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb b05bdbfe4f Polish 8 years ago
Madhura Bhave e73c6bb2e2 Exclude authorization header from trace by default
Closes gh-7974
8 years ago
Madhura Bhave a5a382b8b1 Set AccessTokenConverter if available
Fixes gh-7091
8 years ago
Stephane Nicoll 7253bb334c Merge branch '1.5.x' 8 years ago
Stephane Nicoll e5e497ec3a Document `@ImportAutoConfiguration#exclude`
Closes gh-7862
8 years ago
Stephane Nicoll 03afa0b7b9 Merge branch '1.5.x' 8 years ago
Stephane Nicoll e44b595c0d Fix merge issue 8 years ago
Andy Wilkinson b113ba5e70 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 84edf0167f Merge branch '1.4.x' into 1.5.x 8 years ago