root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
7,890 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

7890 Commits

Author SHA1 Message Date
Spring Buildmaster 819a9574a6 Next Development Version 2016-05-10 05:28:34 +00:00
Andy Wilkinson 3348ed5bb3 Make use of new GetMapping and PostMapping annotations 
Closes gh-5277
 2016-05-09 17:08:16 +01:00
Stephane Nicoll 12bd53777e Merge branch '1.3.x' 2016-05-09 17:50:13 +02:00
Stephane Nicoll 2cacc19c91 Polish 
See gh-5901
 2016-05-09 17:49:55 +02:00
Stephane Nicoll a4ba8f61c9 Backport 6dd8415 
While working on gh-5309, a regression was introduced and fixed right the
way on master. Unfortunately, the fix wasn't applied to `1.3.x` as it
should have been.

This commit applies 6dd8415 to `1.3.x`

Closes gh-5901
 2016-05-09 17:49:16 +02:00
Stephane Nicoll 0df5165a17 Upgrade to Spring REST Docs 1.1.0.RC1 
Closes gh-5896
 2016-05-09 13:44:31 +02:00
Andy Wilkinson db21bcdff6 Make SpringApplicationConfiguration use SpringApplicationContextLoader 
The intention in 1.4 is for the deprecated testing functionality to
behave exactly as it did in 1.3. To help with this, this commit
updates SpringApplicationConfiguration to use
SpringApplicationContextLoader as its loader, just as it did in 1.3.

Closes gh-5882
 2016-05-09 12:27:44 +01:00
Andy Wilkinson 5d2177038f Merge branch '1.3.x' 2016-05-09 11:51:57 +01:00
Vedran Pavic 3891b242a3 Update launch script integration tests 
- Use the latest Docker image for Ubuntu 14.04 LTS based tests
- Add Ubuntu 16.04 LTS based tests

Closes gh-5868
 2016-05-09 11:37:38 +01:00
Stephane Nicoll 1d6b1d7d57 Fix broken build 2016-05-09 08:36:58 +02:00
Stephane Nicoll 832d2b7bb2 Rephrased connection pool detection algorithm 
Closes gh-5864
 2016-05-09 08:15:01 +02:00
Stephane Nicoll b7e7bcf717 Make `spring.session.store-type` mandatory 
Previously, Spring Session would be auto-configured by the mere presence
of Spring Session in the classpath. This was fragile as determining a
store type according to the environment could easily change when the
classpath of the project changes.

This commit makes the store-type property mandatory. If it is not set,
Spring Session is no longer auto-configured.

Closes gh-5838
 2016-05-09 08:07:25 +02:00
Stephane Nicoll d80717349a Merge pull request #5886 from garyrussell/amqp-update 
* pr/5886:
  Upgrade to Spring AMQP 1.6.0.RC1
 2016-05-07 17:16:59 +02:00
Gary Russell 6d953efce1 Upgrade to Spring AMQP 1.6.0.RC1 
Closes gh-5886
 2016-05-07 17:16:07 +02:00
Stephane Nicoll 63a2af07f1 Merge branch '1.3.x' 2016-05-07 17:15:24 +02:00
Stephane Nicoll 4b93a230b7 Merge pull request #5887 from garyrussell/amqp-update13 
* pr/5887:
  Upgrade to Spring AMQP 1.5.6
 2016-05-07 17:15:08 +02:00
Gary Russell e66947735d Upgrade to Spring AMQP 1.5.6 
Closes gh-5887
 2016-05-07 17:14:51 +02:00
Andy Wilkinson 38ad420810 Merge branch '1.3.x' 2016-05-06 16:02:03 +01:00
Andy Wilkinson d77d3ff236 Use a SHA256 checksum in the Homebrew formula 
Closes gh-5885
 2016-05-06 15:58:57 +01:00
Stephane Nicoll 8b60bbe088 Upgrade to Spring Framework 4.3.0.RC2 
Closes gh-5881
 2016-05-06 16:22:02 +02:00
Dave Syer bdc71f693c Fix checksyle 'violations' 2016-05-06 13:11:09 +01:00
Dave Syer be398741e1 Fix binary incompatibility of old TestRestTemplate 
The TestRestTemplate is deprecated (so people can still use it)
but unusable because it only has constructors which depend on the
new options enum.
 2016-05-06 13:07:39 +01:00
Stephane Nicoll b97ebdd17f Merge branch '1.3.x' 2016-05-06 14:07:09 +02:00
Stephane Nicoll 72c2454218 Fixup version numbers following release 2016-05-06 14:06:51 +02:00
Spring Buildmaster 376bbe68d8 Next Development Version 2016-05-06 11:23:57 +00:00
Dave Syer 0ec5b7f43b Fix some more tests 2016-05-06 12:00:33 +01:00
Andy Wilkinson 03383be1ba Use AssertJ in PropertiesPropertySourceLoaderTests 2016-05-06 11:59:03 +01:00
Dave Syer 95c78e4e4c Fix test 2016-05-06 11:36:24 +01:00
Dave Syer 323d6e54a9 Add backwards compatible constructor to InfoEndpoint 
Anyone who is extending InfoEndpoint (per the docs) in 1.3 can
continue to compile their code until they have time to adapt
to the new model.
 2016-05-06 11:35:43 +01:00
Stephane Nicoll 631dc52d88 Merge branch '1.3.x' 2016-05-06 11:57:41 +02:00
Stephane Nicoll 3567e57ff6 Upgrade to Spring Framework 4.2.6.RELEASE 
Closes gh-5322
 2016-05-06 11:57:06 +02:00
Stephane Nicoll b167a03b3d Merge branch '1.3.x' 2016-05-06 11:12:06 +02:00
Stephane Nicoll daf0b081e7 Revert "Add support for UTF-8 in application.properties" 
This reverts commit d6a424f94c.

Closes gh-5361

# Conflicts:
#	spring-boot/src/test/resources/org/springframework/boot/env/test-encoded.properties
 2016-05-06 11:10:36 +02:00
Stephane Nicoll 21536f64e1 Polish info contributor feature 
This commit improves the `InfoContributor` infrastructure as follows:

* `InfoEndpoint` no longer breaks its public API and returns a Map as
before
* `Info` is now immutable
* All properties of the build are now displayed. Since we control the
generation of that file, there is no longer a mode to restrict what's
shown
* Build info is now generated in `META-INF/build-info.properties` by
default

Closes gh-5734
 2016-05-06 10:52:26 +02:00
Andy Wilkinson a1413bdb2d Merge branch '1.3.x' 2016-05-05 18:02:27 +01:00
Andy Wilkinson 5f6be0152b Upgrade to Spring Loaded 1.2.6.RELEASE 
Closes gh-5874
 2016-05-05 17:59:08 +01:00
Andy Wilkinson a079868965 Upgrade to EhCache 2.10.2 
Closes gh-5873
 2016-05-05 17:58:37 +01:00
Andy Wilkinson f1793bbe31 Upgrade to Reactor 2.0.8.RELEASE 
Closes gh-5872
 2016-05-05 17:58:08 +01:00
Andy Wilkinson 5f20504d3b Upgrade to Embedded Mongo 1.50.3 
Closes gh-5871
 2016-05-05 17:56:52 +01:00
Andy Wilkinson 71f7cf581b Upgrade to Undertow 1.3.22.Final 
Closes gh-5858
 2016-05-05 17:56:13 +01:00
Andy Wilkinson a245845521 Correct assertion that were inverted when converting to AssertJ 
See gh-5819
 2016-05-05 17:54:13 +01:00
Andy Wilkinson c76621b34d Merge branch '1.3.x' 2016-05-05 17:36:14 +01:00
Andy Wilkinson 34420a8768 Allow @ConditionalOnProperty to be used as a meta-annotation 
Closes gh-5819
 2016-05-05 17:33:18 +01:00
Andy Wilkinson 5b544c918d Merge branch '1.3.x' 2016-05-05 16:14:17 +01:00
Andy Wilkinson 147956a7b2 Avoid creating multiple BeanNameViewResolver beans 
ErrorMvcAutoConfiguration creates a BeanNameViewResolver bean in case
the user has used @EnabledWebMvc and disabled WebMvcAutoConfiguration.
If the user hasn’t used @EnabledWebMvc, WebMvcAutoConfiguration will
creates its BeanNameViewResolver and override the one that’s already
been defined by ErrorMvcAutoConfiguration.

This commit makes WebMvcAutoConfiguration’s BeanNameViewResolver
definition conditional on there being no existing BeanNameViewResolver
bean definition.

Closes gh-5354
 2016-05-05 16:10:36 +01:00
Dave Syer 042407c917 Add redis starter to BOM 2016-05-05 14:58:40 +01:00
Dave Syer 0acfdd309c Add back (and deprecate via comments) the redis starter 
For people using the old starter location it makes it more friendly
to deprecate now and remove in 2.0.
 2016-05-05 14:27:03 +01:00
Andy Wilkinson 5f12c8c614 Upgrade to Spring Security 4.1.0.RELEASE 
Closes gh-5869
 2016-05-05 13:42:45 +01:00
Andy Wilkinson 0491c0aba1 Merge branch '1.3.x' 2016-05-05 09:14:33 +01:00
Andy Wilkinson ca15de459c Start building against Spring Framework 4.2.6 snapshots 
See gh-5322
 2016-05-05 09:13:30 +01:00