Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

50613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andy Wilkinson
c2db9fa385 Update admin MBean to only be ready when its own context is ready 
Previously, if there was a hierarchy of SpringApplications, the admin
MBean would report that the application was ready as soon as any
application in the hierarchy was ready. This could lead to a client
trying to query a property in the environment before it's available.

This commit updates the MBean registrar to that the MBean only reports
that the application is ready when the context that contains the
registrar has refreshed and fired its ApplicationReadyEvent.

Closes gh-6362
 2016-07-12 09:13:36 +01:00
Stephane Nicoll
bf8a8167aa Merge pull request #6374 from izeye:polish-20160712 
* pr/6374:
  Polish
 2016-07-12 08:47:18 +02:00
Johnny Lim
a9f6ae4422 Polish 
Closes gh-6374
 2016-07-12 08:46:58 +02:00
Phillip Webb
43afc149a1 Consider WebAppConfiguration in @SpringBootTest 
Update SpringBootTestContextBootstrapper to consider the
`@WebAppConfiguration` annotation and use sensible resourceBasePath
defaults.

Fixes gh-6371
 2016-07-11 16:38:10 -07:00
Phillip Webb
df8dfb093b Fix package tangle in jOOQ sample 
Use a custom GeneratorStrategy to fix the package tangles that jOOQ
creates by default.

Fixes gh-6372
 2016-07-11 12:50:42 -07:00
Andy Wilkinson
8b987e29c1 Fix spring-boot-gradle-plugin package tangle 
Relocate `SpringBootPlugin` to fix a package tangle.

Fixes gh-6355
 2016-07-11 10:43:52 -07:00
Phillip Webb
3e62933096 Polish 2016-07-11 10:40:13 -07:00
Andy Wilkinson
8e669e2eef Merge branch '1.3.x 2016-07-11 17:03:16 +01:00
Andy Wilkinson
4963cfd67b Reset thread's interrupted flag when catching InterruptedException 
Closes gh-6360
 2016-07-11 16:46:05 +01:00