Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,826 Commits 23 Branches 0 Tags
63a2af07f1d9a497e7eee6dd3181bc8d40b27f7c
Commit Graph

7826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dave Syer
de6c582c9e Merge remote-tracking branch 'origin/1.3.x' 2016-05-04 21:16:32 +01:00
Dave Syer
905451f92e That BaseConfiguration thing didn't work out after all 
It seems like a base class that defines `@Beans` just doesn't
define any beans. Oh well, time to copy-paste.
 2016-05-04 21:01:40 +01:00
Andy Wilkinson
79b81a95c8 Use SpringBootContextLoader for tests annotated with @WebMvcTest 
Previously, tests annotated with @WebMvcTest would use Spring
Framework’s WebDelegatingSmartContextLoader. This meant that
SpringApplication was not used to create the application context. One
effect of this was that Spring Boot’s logging system was not initialized
and large quantities of debug log output was produced due to Logback’s
default behaviour.

This commit updates WebMvcTestContextBootstrapper so that it uses
SpringBootContextLoader. This aligns the behaviour of @WebMvcTest
with the behaviour of @SpringBootTest and @DataJpaTest.

Closes gh-5847
 2016-05-04 17:15:16 +01:00
Dave Syer
e58bef5f2b Merge remote-tracking branch 'origin/1.3.x' 2016-05-04 14:23:14 +01:00
Dave Syer
1babdd5c2e Remove log config for non boot things 2016-05-04 14:22:41 +01:00
Dave Syer
a86796f126 Merge remote-tracking branch 'origin/1.3.x' 
Conflicts:
	spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
 2016-05-04 14:14:19 +01:00
Dave Syer
e98264debf Move base configuration class to a separate file 
to stop it from being included in the enclosing @Configuration.

That way, if the app is not a web app, then there really is a
client_credentials OAuth2 resource (as claimed in the user guide).

Fixes gh-5735
 2016-05-04 14:02:00 +01:00
Stephane Nicoll
04c53eab2f Merge pull request #5852 from izeye/ssl 
* pr/5852:
  Polish "Fix customization of Jetty's SSL trust store"
  Fix customization of Jetty's SSL trust store
 2016-05-04 09:59:07 +02:00
Stephane Nicoll
fb9a61cd85 Polish "Fix customization of Jetty's SSL trust store" 
Closes gh-5852
 2016-05-04 09:58:52 +02:00
Johnny Lim
727dd12852 Fix customization of Jetty's SSL trust store 
See gh-5852
 2016-05-04 09:32:58 +02:00
Andy Wilkinson
e8e728106e Don’t expect a charset attribute on a text/css Content-Type 
Following the encoding change made in 428a10a, the character encoding
of a response is no longer forced.

See gh-5459
 2016-05-03 22:07:22 +01:00
Stephane Nicoll
e71cea55ba Remove useless import 2016-05-03 17:27:14 +02:00
Stephane Nicoll
428a10a7d7 Only force request encoding 
A recent Spring Framework change in `CharacterEncodingFilter` allows to
configure the force flag separately for requests and responses. This
commit enables the flag only for requests which should provide a better
default with binary content.

Closes gh-5459
 2016-05-03 17:24:57 +02:00
Andy Wilkinson
f8a4459aa1 Ensure that logfile endpoint documentation has some log entries to use 
Closes gh-5848
 2016-05-03 15:13:34 +01:00