Commit Graph

8389 Commits

Author SHA1 Message Date
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
Andy Wilkinson eb995cc07a Add dependency management for jackson-datatype-jaxrs
Closes gh-6369
2016-07-11 12:40:22 +01:00
Stephane Nicoll fcf535901e Polish doc
Closes gh-6008
2016-07-11 13:31:27 +02:00
Stephane Nicoll 9a98113a2c Fix gradle samples replacement regex
Closes gh-6357
2016-07-11 12:45:28 +02:00
Andy Wilkinson 50d2d492ed Merge branch '1.3.x 2016-07-11 11:28:16 +01:00
Andy Wilkinson e53d3167ab Set TCCL of shutdown thread when triggered by the shutdown endpoint
Previously, the shutdown endpoint would spawn a new thread to perform
the shutdown but did not explicitly configure its thread context
class loader (TCCL). This mean that the new thread would use the
request thread's TCCL as its TCCL. This meant that a different TCCL
would be used compared to a shutdown triggered by the shutdown hook
and also caused problems with Tomcat's thread leak detection logic.

This commit updates the shutdown endpoint to explicitly configure the
TCCL of the shutdown thread to be the ClassLoader that loaded the
endpoint's class.

Closes gh-6361
2016-07-11 11:27:41 +01:00
Andy Wilkinson c974de0119 Merge branch '1.3.x 2016-07-11 11:27:15 +01:00
Stephane Nicoll 277da462ce Document differences between @Value and @ConfigurationProperties
Closes gh-4892
2016-07-11 12:23:30 +02:00
Andy Wilkinson 5f751fe356 Set TCCL of shutdown thread when triggered by the shutdown endpoint
Previously, the shutdown endpoint would spawn a new thread to perform
the shutdown but did not explicitly configure its thread context
class loader (TCCL). This mean that the new thread would use the
request thread's TCCL as its TCCL. This meant that a different TCCL
would be used compared to a shutdown triggered by the shutdown hook
and also caused problems with Tomcat's thread leak detection logic.

This commit updates the shutdown endpoint to explicitly configure the
TCCL of the shutdown thread to be the ClassLoader that loaded the
endpoint's class.

Closes gh-6361
2016-07-11 11:16:34 +01:00
Stephane Nicoll a72e494896 Merge branch '1.3.x' 2016-07-11 11:08:52 +02:00
Stephane Nicoll 78879f4bdb Fix documentation
Closes gh-6358
2016-07-11 11:08:36 +02:00
Stephane Nicoll ca14c06e18 Merge pull request #6365 from artembilan:SI_Java_DSL-1.1.3
* pr/6365:
  Upgrade to Spring Integration Java DSL 1.1.3.RELEASE
2016-07-09 07:21:06 +02:00
Artem Bilan f152111685 Upgrade to Spring Integration Java DSL 1.1.3.RELEASE
Closes gh-6365
2016-07-09 07:20:14 +02:00
Andy Wilkinson 25ba9a56e6 Merge branch '1.3.x 2016-07-08 11:18:58 +01:00
Andy Wilkinson 26a233a870 Upgrade to Hikari 2.4.7
Closes gh-6344
2016-07-08 11:18:14 +01:00
Stephane Nicoll 7f66335e6d Merge pull request #6350 from eddumelendez:spring_security_4.1.1
* pr/6350:
  Upgrade to Spring Security 4.1.1.RELEASE
2016-07-08 09:12:01 +02:00
Eddú Meléndez 8c273c35fa Upgrade to Spring Security 4.1.1.RELEASE
Closes gh-6350
2016-07-08 09:10:56 +02:00
Phillip Webb 629ce6a527 Clarify @EntityScan deprecated Javadoc
Closes gh-6340
2016-07-07 14:16:30 -07:00
Stephane Nicoll 17b71df2dd Merge branch '1.3.x' 2016-07-07 15:38:37 +02:00
Stephane Nicoll bbb29dd70f Remove `@Primary` from `IntegrationMBeanExporter`
Commit 3ea84f9e1 has wrongly introduced a `@Primary` marker on
`IntegrationMBeanExporter` so any use of both Spring's JMX support
and Spring Integration's JMX support leads to an exception. This commit
makes sure to remove the unnecessary `@Primary`

Closes gh-6328
2016-07-07 15:36:02 +02:00
Andy Wilkinson ccaa19d51f Document how to configure a RestTemplate to use a proxy
Closes gh-6331
2016-07-07 10:58:09 +01:00
Stephane Nicoll 0356be7b95 Refine AliasFor usage
This commit makes sure to use `getAliasedStringArray` rather than
`getStringArray` as the latter does not work with ASM. While this will
probably be fixed in the core framework, this commit also adds dedicated
tests with ASM to ensure that the code works as expected.

Closes gh-6337
2016-07-07 11:47:24 +02:00
Phillip Webb d4011687e4 Increase maven central timeout 2016-07-06 21:45:06 -07:00
Phillip Webb 1f4de8d286 Revert "Use Google Maven Central mirror"
This reverts commit 7bb39f8206.

Unfortunately the mirror seems incomplete
2016-07-06 21:23:54 -07:00
Phillip Webb 7bb39f8206 Use Google Maven Central mirror
Add mirror setting so that a full build uses the Google mirror of Maven
Central.
2016-07-06 19:55:20 -07:00