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
8,522 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

8522 Commits

Author SHA1 Message Date
Phillip Webb 5ee8a7552b Merge pull request #6414 from artembilan/Spring-AMQP-1.6.1 
* Spring-AMQP-1.6.1:
  Upgrade to Spring AMQP 1.6.1.RELEASE
 2016-07-18 15:12:49 -07:00
Artem Bilan 6741e6a240 Upgrade to Spring AMQP 1.6.1.RELEASE 
Closes gh-6414
 2016-07-18 15:11:57 -07:00
Phillip Webb 8bf3f275c9 Merge branch '1.3.x' 2016-07-18 14:35:56 -07:00
Phillip Webb 49676ee986 Polish 2016-07-18 14:31:23 -07:00
Phillip Webb 2cb38bc8e2 Apply Log4J2LoggingSystem.FILTER to main config 
Update Log4J2LoggingSystem so that the FILTER is applied to the main
configuration and not to the root logger. Prior to this commit calls
to `logger.isErrorEnabled()` would not consider the filter and hence
would always return `true`. This caused `SpringApplication` to silently
swallow exceptions.

Fixes gh-5271
 2016-07-18 14:26:11 -07:00
Phillip Webb 3c67ecca61 Downgrade to HSQLDB 2.3.3 
Closes gh-6415
 2016-07-18 13:07:00 -07:00
Phillip Webb 3b0b65cafc Fix deprecation warning 2016-07-18 13:05:19 -07:00
Phillip Webb e03e109874 Polish 2016-07-18 11:27:55 -07:00
Phillip Webb ef6139be63 Refactor from deprecated getAliasedStringArray 
Update ServletComponentScanRegistrar to make use of Spring Framework's
updated alias support with ASM reading.

See gh-6337
 2016-07-18 11:26:57 -07:00
Phillip Webb 037e697406 Restore DataSourceProperties get...() methods 
Restore original get method functionality in DataSourceProperties in
a deprecated form.

Fixes gh-6406
 2016-07-18 11:16:33 -07:00
Andy Wilkinson 48596dfbde Document workaround for CRaSH's limited class path scanning 
Closes gh-6384
 2016-07-18 12:11:45 +01:00
Stephane Nicoll d708bff26d Merge pull request #6059 from RichardCSantana:master 
* pr/6059:
  Polish contribution
  Fix Bug HealthIndicator for Redis Cluster
 2016-07-18 08:59:39 +02:00
Stephane Nicoll 7e6f4021de Polish contribution 
Closes gh-6059
 2016-07-18 08:54:27 +02:00
RichardCSantana 42bb843364 Fix Bug HealthIndicator for Redis Cluster 
See gh-6059
 2016-07-18 08:48:01 +02:00
Phillip Webb 34893eee9d Refine service documentation 
See gh-5505
 2016-07-17 11:58:19 -07:00
Stephane Nicoll 1f3d9235a8 Fix typo 2016-07-16 18:20:32 +02:00
Stephane Nicoll 7969d97f40 Revert to maven-compiler-plugin 3.1 
This commit reverts b8ee1f7

Closes gh-6334
 2016-07-16 09:41:07 +02:00
Phillip Webb db287782a2 Remove duplicate documentation bookmark 
See gh-5505
 2016-07-15 16:29:33 -07:00
Phillip Webb c265de2535 Use @AliasFor in @AutoConfigureRestDocs 
Replace custom alias logic in @AutoConfigureRestDocs with @AliasFor.

Closes gh-6403
 2016-07-15 16:24:58 -07:00
Phillip Webb c889c09066 Refactor from deprecated getAliasedStringArray 
Update EntityScanPackages to make use of Spring Framework's updated
alias support with ASM reading.

Closes gh-6337
 2016-07-15 16:18:20 -07:00
Phillip Webb 291f131e60 Remove `/urandom` references from the docs 
Remove a dangling line left after commit 7b641d5d.

Fixes gh-6229
 2016-07-15 15:34:24 -07:00
Phillip Webb a1345e17f1 Improve "fully executable jars" documentation 
Closes gh-5505
 2016-07-15 15:32:13 -07:00
Phillip Webb 51ede0cac6 Document ConfigFile...Initializer limitations 
Update the reference documentation with a note about the limitations of
ConfigFileApplicationContextInitializer.

Fixes gh-6120
 2016-07-15 13:16:33 -07:00
Phillip Webb 7b641d5d55 Remove `/urandom` references from the docs 
Fixes gh-6229
 2016-07-15 13:06:57 -07:00
Phillip Webb 68b9792ed6 Fix FixedAuthoritiesExtractor map extract bug 
Fix issue where FixedAuthoritiesExtractor would fail to obtain standard
item from the map because an incorrect key was used.

Fixes gh-6396
 2016-07-15 13:01:43 -07:00
Stephane Nicoll 5a941bb5a5 Polish doc 
See gh-4313
 2016-07-14 10:00:51 +02:00
Phillip Webb f26bdd32ff Downgrade maven-compiler-plugin to 3.5 
Revert the previous upgrade due to the MCOMPILER-271 issue.

Fixes gh-6391
 2016-07-13 17:11:47 -07:00
Phillip Webb cca6a38558 Updated to Spring Security 4.1.2 SNAPSHOT 
See gh-6390
 2016-07-13 15:38:44 -07:00
Stephane Nicoll 6d33adc5dd Add "Merging YAML lists" documentation 
Add a dedicated section to explain how YAML lists are merged.

See gh-4313
 2016-07-13 15:34:14 -07:00
Stephane Nicoll 1d5549ff01 Merge complex types from multiple source correctly 
Update PropertySourcesPropertyValues so that source detection logic for
collection values also considers complex types. Prior to this commit
properties of the following form were processed correctly:

	PropertySource-A
	  list[0]=x

	PropertySource-B
	  list[0]=y
	  list[1]=z

But properties of the form were not:

	PropertySource-A
	  list[0].name=x

	PropertySource-B
	  list[0].name=y
	  list[1].name=z

Fixes gh-4313
See gh-2611
 2016-07-13 15:27:01 -07:00
Phillip Webb e6f6e83c39 Polish 2016-07-13 11:17:59 -07:00
Phillip Webb d9e8676f77 Merge branch '1.3.x' 2016-07-13 10:48:02 -07:00
Phillip Webb fd6c0029dc Formatting 2016-07-13 10:44:37 -07:00
Andy Wilkinson f84f31b47d Add setReadTimeout and setConnectTimeout to RestTemplateBuilder 
Closes gh-6346
 2016-07-13 16:40:32 +01:00
Dave Syer 9fdef15d50 Merge branch '1.3.x' 2016-07-13 16:06:38 +01:00
Dave Syer af426d0856 Be more defensive about a null password in Undertow SSL 
Fixes gh-6387
 2016-07-13 15:36:55 +01:00
Andy Wilkinson 041da3b6cd Document how to configure a component that Hibernate depends upon 
Closes gh-6333
 2016-07-13 12:19:24 +01:00
Andy Wilkinson bf618d505c Merge branch '1.3.x 2016-07-13 10:38:03 +01:00
Andy Wilkinson b1dd92881d Retry class file upload to remote application that fails to connect 
Closes gh-6339
 2016-07-13 10:35:42 +01:00
Andy Wilkinson b8ad9537a6 Merge branch '1.3.x 2016-07-13 09:56:00 +01:00
Andy Wilkinson 68fb5789ca Create one SpringApplicationAdminMXBeanRegistrar per context hierarchy 
Previously, one SpringApplicationAdminMXBeanRegistrar was created
per context. When there was more then one context this would result
in a javax.management.InstanceAlreadyExistsException being thrown
as an attempt was made to register the MBean more than once.

This commit updates SpringApplicationAdminJmxAutoConfiguration so
that the registrar is only created when there's no such existing bean
in the context hierarchy.

Closes gh-6378
 2016-07-13 09:52:23 +01:00
Andy Wilkinson 91df749839 Improve usage of ConcurrentMap 
- Call get rather than containsKey then get
- Only call putIfAbsent after get has returned null to avoid unnecessary
  object creation

Closes gh-6382
 2016-07-13 09:26:28 +01:00
Stephane Nicoll 6bd7a2fedd Deprecate HornetQ support 
Closes gh-6377
 2016-07-13 10:06:19 +02:00
Andy Wilkinson 8319291efd Merge pull request #6379 from Adrian Cole 
* gh-6379:
  Improves metrics performance by not guarding map.get
 2016-07-13 08:56:56 +01:00
Adrian Cole 38e3b39d3b Improves metrics performance by not guarding map.get 
ConcurrentHashMap implements `containsKey` with `get`. By removing a
redundant call to `containsKey`, we guarantee better performance in our
counter services.

The geek inside measured this with JMH, and found under 4 threads of
contention, throughput on this check was 40% higher in success case.

Benchmark                                  Mode  Cnt     Score     Error   Units
TestBenchmarks.containsKeyAndGet_success  thrpt   30   432.389 ±  20.616  ops/us
TestBenchmarks.get_success                thrpt   30   606.789 ±  10.848  ops/us

Closes gh-6379
 2016-07-13 08:56:13 +01:00
Andy Wilkinson 0792d43a93 Merge branch '1.3.x 2016-07-13 08:51:15 +01:00
Andy Wilkinson 49302b3449 Merge pull request #6381 from Raja Dilip Kolli 
* gh-6381:
  Upgrade to Thymeleaf 2.1.5.RELEASE
 2016-07-13 08:50:08 +01:00
Raja Dilip Kolli e49ec03215 Upgrade to Thymeleaf 2.1.5.RELEASE 
Closes gh-6381
 2016-07-13 08:49:19 +01:00
Andy Wilkinson db83e89922 Add support for Thymeleaf 3 while keeping Thymeleaf 2 as the default 
Closes gh-4393
 2016-07-12 23:02:04 +01:00
Andy Wilkinson 18d99245dd Merge branch '1.3.x 2016-07-12 09:17:03 +01:00