root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
8,377 Commits 23 Branches 345 Tags 279 MiB
Commit Graph

8377 Commits

Author SHA1 Message Date
Stephane Nicoll 4b91965dde Fix indent 2016-07-05 11:26:15 +02:00
Stephane Nicoll 78e580c8db Polish 2016-07-05 11:19:11 +02:00
Phillip Webb f10286caf1 Fix spring.profiles.default with profile enabled by configuration file 
Previously, if the user configured a custom default profile and then
enabled another profile using a configuration file, the custom default
profile would be activated when it should not have been.

This commit updates ConfigFileApplicationListener so that when a
profile is activated via a configuration file, any profiles
that are queued purely because they are a default profile are removed
from the queue. This ensures that a default profile is not active
when another profile is activated via a configuration file.

Closes gh-5998
 2016-07-05 09:41:11 +01:00
Stephane Nicoll 0545231049 Polish 2016-07-05 10:37:22 +02:00
Stephane Nicoll 92b0423788 Merge branch '1.3.x' 2016-07-04 16:45:26 +02:00
Stephane Nicoll eeb95693b3 Fixup version numbers following release 2016-07-04 16:45:17 +02:00
Spring Buildmaster 2216369348 Next Development Version 2016-07-04 14:15:02 +00:00
Andy Wilkinson 8cbe30ab5e Ensure that Jersey and Jackson honour JAXB annotations 
By default Jersey configures Jackson to use both Jackson annotations
and JAXB annotations when introspective types for (de)serialization.
However, the changes made in 5776d6a8 mean that Jersey no longer uses
its default ObjectMapper configuration and uses the auto-configured
ObjectMapper instead. This had the unwanted side-effect of leaving
Jersey with an ObjectMapper that only uses Jackson annotations and
ignores JAXB annotations.

This commit updates JerseyAutoConfiguration so that it will add the
JaxbAnnotationIntrospector to the auto-configured ObjectMapper for
both serialization and deserialization. It uses
AnnotationIntrospectorPair to ensure retain any existing
introspectors.

Closes gh-6310
 2016-07-04 14:44:31 +01:00
Stephane Nicoll ce3f4bd068 Upgrade to Spring Framework 4.3.1.RELEASE 
Closes gh-6197
 2016-07-04 13:27:28 +02:00
Stephane Nicoll 46acc8042f Merge branch '1.3.x' 2016-07-04 13:25:38 +02:00
Stephane Nicoll 566b4e9a16 Upgrade to Spring Framework 4.2.7.RELEASE 
Closes gh-6249
 2016-07-04 13:25:11 +02:00
Andy Wilkinson fd16865988 Merge branch '1.3.x' 2016-07-04 09:28:50 +01:00
Andy Wilkinson 46a1f0d00e Upgrade to Spring Cloud Connectors 1.2.3.RELEASE 
Closes gh-6315
 2016-07-04 09:27:57 +01:00
Phillip Webb b5df4f8d08 Merge branch '1.3.x' 2016-07-03 21:55:38 -07:00
Phillip Webb e452373c04 Fix imports in health sample documentation 
Fixes gh-6312
 2016-07-03 21:52:57 -07:00
Stephane Nicoll a71ad73065 Document missing property 2016-07-03 17:10:43 +02:00
Phillip Webb 3c013322a2 Merge branch 'gh-5670' 
Closes gh-5670
 2016-07-02 11:17:34 -07:00
Phillip Webb 2583a534e6 Document heapdump endpoint 
See gh-5670
 2016-07-02 11:15:47 -07:00
Lari Hotari 9f07e94450 Add MVC actuator endpoint for heap dumps 
Add MVC only endpoint to obtain GZip compressed heap dump files.

See gh-5670
 2016-07-02 11:14:42 -07:00
Lari Hotari e1893f66ce Extract AbstractMvcEndpoint class 
Extract common functionality from Spring MVC only endpoints.

See gh-5670
 2016-07-02 11:13:21 -07:00
Phillip Webb b732aeb453 Polish 2016-07-02 10:52:59 -07:00
Andy Wilkinson 8ce85ffb3d Upgrade to Git Commit ID Plugin 2.2.1 
Closes gh-6303
 2016-07-01 15:44:45 +01:00
Andy Wilkinson dc7edd4c4d Upgrade to Exec Maven Plugin 1.5.0 
Closes gh-6302
 2016-07-01 15:44:45 +01:00
Andy Wilkinson a7a5e5c741 Upgrade to Build Helper Maven Plugin 1.10 
Closes gh-6301
 2016-07-01 15:44:45 +01:00
Andy Wilkinson cc6dd6054e Upgrade to Maven War Plugin 2.6 
Closes gh-6300
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 79af9231f8 Upgrade to Maven Site Plugin 3.5.1 
closes gh-6298
 2016-07-01 15:44:45 +01:00
Andy Wilkinson fc0f9fa67c Upgrade to Maven Shade Plugin 2.4.3 
Closes gh-6297
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 7db31d78f1 Upgrade to Maven Jar Plugin 2.6 
Closes gh-6296
 2016-07-01 15:44:45 +01:00
Andy Wilkinson d6798c226a Upgrade to Maven Eclipse Plugin 2.10 
Closes gh-6295
 2016-07-01 15:44:45 +01:00
Andy Wilkinson b8ee1f769c Upgrade to Maven Compiler Plugin 3.5.1 
Closes gh-6293
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 27bfa7f310 Upgrade to Maven Clean Plugin 2.6.1 
Closes gh-6292
 2016-07-01 15:44:45 +01:00
Andy Wilkinson c24c5aeb3b Upgrade to Maven Assembly Plugin 2.6 
Closes gh-6291
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 894a8563a5 Upgrade to Maven Ant Run Plugin 1.8 
Closes gh-6290
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 6f1c07c2d8 Upgrade to Webjars Locator 0.32 
Closes gh-6289
 2016-07-01 15:44:45 +01:00
Andy Wilkinson ec421b36de Upgrade to Neo4J OGM 2.0.3 
Closes gh-6288
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 97d52665f4 Upgrade to MariaDB Java Client 1.4.6 
Closes gh-6287
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 6fa57839cf Upgrade to Narayana 5.3.3.Final 
Closes gh-6286
 2016-07-01 15:44:45 +01:00
Andy Wilkinson badfc65734 Upgrade to JBoss Transaction SPI 7.3.2.Final 
Closes gh-6285
 2016-07-01 15:44:45 +01:00
Andy Wilkinson f6b6f125e1 Upgrade to Jetty 9.3.10.v20160621 
Closes gh-6284
 2016-07-01 15:44:45 +01:00
Andy Wilkinson a8c8fe117d Upgrade to SolrJ 5.5.2 
Closes gh-6283
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 4697432edd Upgrade to Artemis 1.3.0 
Closes gh-6282
 2016-07-01 15:44:45 +01:00
Andy Wilkinson a433a04d38 Upgrade to Gson 2.7 
Closes gh-6281
 2016-07-01 15:44:45 +01:00
Andy Wilkinson b5ae8c3b66 Upgrade to Caffeine 2.3.1 
Closes gh-6280
 2016-07-01 15:44:45 +01:00
Andy Wilkinson 6977586e4b Upgrade to Jackson 2.7.5 
Closes gh-6279
 2016-07-01 15:44:45 +01:00
Andy Wilkinson ce7a1e121b Upgrade to Couchbase Java Client 2.2.8 
Closes gh-6278
 2016-07-01 15:44:45 +01:00
Andy Wilkinson fb79ec5825 Upgrade to Hazelcast 3.6.4 
Closes gh-6277
 2016-07-01 15:44:45 +01:00
Stephane Nicoll 245e257868 Merge pull request #6304 from izeye:patch-47 
* pr/6304:
  Remove duplicate property reference
 2016-07-01 16:01:13 +02:00
Johnny Lim 4d0313f9c0 Remove duplicate property reference 
Closes gh-6304
 2016-07-01 16:00:38 +02:00
Andy Wilkinson 5c6537c234 Consistently synchronize on this.monitor in InMemoryAuditEventRepository 
See gh-6261
 2016-07-01 14:09:07 +01:00
Stephane Nicoll 00a56cdf31 Merge branch '1.3.x' 2016-07-01 14:07:18 +02:00