Commit Graph

12104 Commits

Author SHA1 Message Date
Andy Wilkinson 6acf789264 Merge branch '1.5.x' 2017-05-22 16:50:19 +01:00
Andy Wilkinson d058ed38a8 Merge pull request #9095 from hengyunabc
* gh-9095:
  Polish "Fail startup when Tomcat's context fails to start"
  Fail startup when Tomcat's context fails to start
2017-05-22 16:18:58 +01:00
hengyunabc 8c46644231 Polish "Fail startup when Tomcat's context fails to start"
Closes gh-9095
2017-05-22 16:18:29 +01:00
hengyunabc 217b237b37 Fail startup when Tomcat's context fails to start
See gh-9095
2017-05-22 16:18:29 +01:00
Stephane Nicoll 390be7a59d Merge branch '1.5.x' 2017-05-22 15:44:26 +02:00
Stephane Nicoll b61b1f0e08 Make sure Atomikos default are applied consistently
This commit makes sure to apply Atomikos defaults also adds a test that
validates Atomikos defaults are consistent.

As a side effect of that, `threadedTwoPhaseCommit` is now `false` (which
is effectively what users got with no customization anyway since that
default was changed in Atomikos 3.7

Closes gh-9141
2017-05-22 15:43:12 +02:00
Andy Wilkinson cef7e73725 Provide plugin management for Flyway's Maven plugin
Closes gh-9265
2017-05-22 14:10:47 +01:00
Stephane Nicoll a1adcd9919 Merge branch '1.5.x' 2017-05-22 11:07:25 +02:00
Stephane Nicoll 4cc515054e Merge branch '1.4.x' into 1.5.x 2017-05-22 11:06:40 +02:00
Stephane Nicoll a59000354c Support for TransactionAwareCacheDecorator
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-8984
2017-05-22 11:05:39 +02:00
Stephane Nicoll b73e1d46ae Start building against Spring Framework snapshots
See gh-9280
2017-05-22 10:07:44 +02:00
Stephane Nicoll c1c0b0f3b3 Add missing properties 2017-05-21 19:05:48 +02:00
Madhura Bhave bd37089fbf Merge branch '1.5.x' 2017-05-19 16:31:00 -07:00
Madhura Bhave 57dfbd50a7 Fix documentation for health endpoint security
Fixes gh-9273
2017-05-19 16:22:25 -07:00
Stephane Nicoll 60a50a7a35 Merge pull request #8919 from eddumelendez:gh-8814
* pr/8919:
  Modify return on post /loggers to HTTP 204
2017-05-19 09:43:00 +02:00
Eddú Meléndez ce0b1b242b Modify return on post /loggers to HTTP 204
This commit alter the return http status code from 200 to 204.

Closes gh-8919
2017-05-19 09:42:03 +02:00
Madhura Bhave 2ccefbc275 Simplify MapBinderTests 2017-05-18 13:14:08 -07:00
Madhura Bhave 84a38c5606 Bind maps with dots in key names and list values without []
Closes gh-9255
2017-05-18 13:02:42 -07:00
Stephane Nicoll f0d34250b0 Merge branch '1.5.x' 2017-05-18 13:28:12 +02:00
Stephane Nicoll f8de022f0a Fix typo
Closes gh-9257
2017-05-18 13:27:43 +02:00
Stephane Nicoll f707582570 Add missing custom status in example
Closes gh-9256
2017-05-18 13:26:39 +02:00
Madhura Bhave 366031cfb6 Add missing tests for Collection and Map binders 2017-05-17 15:57:01 -07:00
Madhura Bhave e9d7441e4d Restrict scalars in MapBinder to java.lang
Fixes gh-9209
2017-05-17 15:57:01 -07:00
Stephane Nicoll d0670d5b95 Fix reference to actuator endpoints
Closes gh-9247
2017-05-17 10:15:09 +02:00
Stephane Nicoll 6b83217830 Fix checkstyle violation 2017-05-16 10:00:29 +03:00
Phillip Webb 1d06849607 Support rebind on ConfigurationProperties
Update `ConfigurationPropertiesBindingPostProcessor` to once again allow
beans to be bound again following changes to the underlying property
sources.

Fixes gh-9160
2017-05-15 22:15:32 -07:00
Phillip Webb 21a2ba176b Refine JSON origin source logic
Update `SpringApplicationJsonEnvironmentPostProcessor` so that the
returned `PropertyOrigin` uses the source property name and not the
JSON key.

See gh-8932
2017-05-15 21:30:29 -07:00
Phillip Webb 889d43ddc4 Refine SpringApplication source types
Update `SpringApplication` so that the `run` methods and constructors
now require `Class<?>` arguments, rather than `Objects`. String based
sources can still be loaded, but must now be set on the `getSources()`
collections. `Package` and `Resource` types are no longer directly
supported.

This change should help IDEs offer better content assist, and will
help integrations with alternative languages such as Ceylon.

Users currently passing in Class references or using the
`spring.main.sources` property should not be affected by this change. If
an XML resource is being used, some refactoring may be required (see the
changes to `SampleSpringXmlApplication` in this commit).

Fixes gh-9170
2017-05-15 20:35:29 -07:00
Phillip Webb 302f038e84 Polish 2017-05-15 20:35:29 -07:00
Madhura Bhave 226db4697f Make SpringApplicationJsonEnvironmentPostProcessor origin aware
Closes gh-8932
2017-05-15 16:09:40 -07:00
Phillip Webb f4444a36b3 Merge branch '1.5.x' 2017-05-15 16:00:28 -07:00
Phillip Webb 440d03bf9e Merge branch '1.4.x' into 1.5.x 2017-05-15 15:59:08 -07:00
Phillip Webb 74f411faed Formatting 2017-05-15 15:58:30 -07:00
Brian Clozel 2ab1191f8d Do not expose servlet locations in WebFlux
The `spring.resources.static-locations` key (see `ResourceProperties`)
lists many locations by default, including `"classpath:/static"` and
`"/"`. The latter is about exposing resources located in the root
servlet location.

Reactive web applications don't depend on a Servlet-related
`ApplicationContext`/`ResourceLoader`, so `"/"` is then resolved as
`"classpath:/"`, which exposes the whole classpath.

To avoid such situations, the `GenericReactiveWebApplicationContext`
overrides the `getResourceByPath(String path)` method and always returns
non existent resources if the path starts with `"/"`.

Fixes gh-8485
2017-05-15 22:46:27 +02:00
Andy Wilkinson 00021dcd75 Upgrade to Spring Batch 4.0.0.M2
Closes gh-7645
2017-05-15 20:35:07 +01:00
Andy Wilkinson ee499b029a Merge branch '1.5.x' 2017-05-15 19:58:34 +01:00
Andy Wilkinson 5e35cdccce Merge pull request #9110 from Gytis Trikleris
* gh-9110:
  Log a warning if a health indicator throws an exception
2017-05-15 19:58:23 +01:00
Gytis Trikleris 00823d41a9 Log a warning if a health indicator throws an exception
Closes gh-9110
2017-05-15 19:53:55 +01:00
Andy Wilkinson 7f18b3d879 Merge branch '1.5.x' 2017-05-15 19:50:41 +01:00
Andy Wilkinson 232e05c0c4 Merge pull request #9239 from Artem Bilan
* gh-9239:
  Upgrade to Spring Integration Java DSL 1.2.2
2017-05-15 19:49:59 +01:00
Artem Bilan d82a23a201 Upgrade to Spring Integration Java DSL 1.2.2
Closes gh-9239
2017-05-15 19:49:34 +01:00
Phillip Webb 9a4a20537c Polish 2017-05-15 11:19:19 -07:00
Andy Wilkinson 2c315d3d6f Merge branch '1.5.x' 2017-05-15 17:44:50 +01:00
Andy Wilkinson fd2ab2fee0 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:44:42 +01:00
Andy Wilkinson 198093c6a8 Fix violation reported by Checkstyle 2017-05-15 17:44:17 +01:00
Andy Wilkinson c9c014cde7 Drop IgnoreNestedPropertiesBindHandler and its tests
This should have been done as part of abdc239.

Closes gh-8657
2017-05-15 17:19:17 +01:00
Andy Wilkinson 8afaba0b9f Merge branch '1.5.x' 2017-05-15 17:11:56 +01:00
Andy Wilkinson 5693acf558 Merge branch '1.4.x' into 1.5.x 2017-05-15 17:08:53 +01:00
Andy Wilkinson a6f8351dd6 Close Liquibase-specific DataSource once database has been migrated
Previously, when the liquibase.url, .username, and .password
properties were used to configure a DataSource specifically for
Liquibase that DataSource would never be explicitly closed. As it is
created by DataSourceBuilder with no explicitly configured type it
will use whichever connection pool is available and, therefore, will
create and keep open the pool's minimum number of connections. This
is an unnecessary use of resources both in the application and in the
database.

This commit updates LiquibaseAutoConfiguration so that if it uses
DataSourceBuilder to create a DataSource then it will also close that
DataSource once the database has been migrated.

Closes gh-9218
2017-05-15 17:08:45 +01:00
Andy Wilkinson 2c96bce5cd Address some warnings that are output during javadoc generation 2017-05-15 13:16:33 +01:00