Commit Graph

12154 Commits (23eedce868f8f4d26175d156426f11257689d1b0)
 

Author SHA1 Message Date
Andy Wilkinson 6acf789264 Merge branch '1.5.x' 8 years ago
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
8 years ago
hengyunabc 8c46644231 Polish "Fail startup when Tomcat's context fails to start"
Closes gh-9095
8 years ago
hengyunabc 217b237b37 Fail startup when Tomcat's context fails to start
See gh-9095
8 years ago
Stephane Nicoll 390be7a59d Merge branch '1.5.x' 8 years ago
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
8 years ago
Andy Wilkinson cef7e73725 Provide plugin management for Flyway's Maven plugin
Closes gh-9265
8 years ago
Stephane Nicoll a1adcd9919 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 4cc515054e Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a59000354c Support for TransactionAwareCacheDecorator
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-8984
8 years ago
Stephane Nicoll b73e1d46ae Start building against Spring Framework snapshots
See gh-9280
8 years ago
Stephane Nicoll c1c0b0f3b3 Add missing properties 8 years ago
Madhura Bhave bd37089fbf Merge branch '1.5.x' 8 years ago
Madhura Bhave 57dfbd50a7 Fix documentation for health endpoint security
Fixes gh-9273
8 years ago
Stephane Nicoll 60a50a7a35 Merge pull request #8919 from eddumelendez:gh-8814
* pr/8919:
  Modify return on post /loggers to HTTP 204
8 years ago
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
8 years ago
Madhura Bhave 2ccefbc275 Simplify MapBinderTests 8 years ago
Madhura Bhave 84a38c5606 Bind maps with dots in key names and list values without []
Closes gh-9255
8 years ago
Stephane Nicoll f0d34250b0 Merge branch '1.5.x' 8 years ago
Stephane Nicoll f8de022f0a Fix typo
Closes gh-9257
8 years ago
Stephane Nicoll f707582570 Add missing custom status in example
Closes gh-9256
8 years ago
Madhura Bhave 366031cfb6 Add missing tests for Collection and Map binders 8 years ago
Madhura Bhave e9d7441e4d Restrict scalars in MapBinder to java.lang
Fixes gh-9209
8 years ago
Stephane Nicoll d0670d5b95 Fix reference to actuator endpoints
Closes gh-9247
8 years ago
Stephane Nicoll 6b83217830 Fix checkstyle violation 8 years ago
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
8 years ago
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
8 years ago
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
8 years ago
Phillip Webb 302f038e84 Polish 8 years ago
Madhura Bhave 226db4697f Make SpringApplicationJsonEnvironmentPostProcessor origin aware
Closes gh-8932
8 years ago
Phillip Webb f4444a36b3 Merge branch '1.5.x' 8 years ago
Phillip Webb 440d03bf9e Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb 74f411faed Formatting 8 years ago
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
8 years ago
Andy Wilkinson 00021dcd75 Upgrade to Spring Batch 4.0.0.M2
Closes gh-7645
8 years ago
Andy Wilkinson ee499b029a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5e35cdccce Merge pull request #9110 from Gytis Trikleris
* gh-9110:
  Log a warning if a health indicator throws an exception
8 years ago
Gytis Trikleris 00823d41a9 Log a warning if a health indicator throws an exception
Closes gh-9110
8 years ago
Andy Wilkinson 7f18b3d879 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 232e05c0c4 Merge pull request #9239 from Artem Bilan
* gh-9239:
  Upgrade to Spring Integration Java DSL 1.2.2
8 years ago
Artem Bilan d82a23a201 Upgrade to Spring Integration Java DSL 1.2.2
Closes gh-9239
8 years ago
Phillip Webb 9a4a20537c Polish 8 years ago
Andy Wilkinson 2c315d3d6f Merge branch '1.5.x' 8 years ago
Andy Wilkinson fd2ab2fee0 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 198093c6a8 Fix violation reported by Checkstyle 8 years ago
Andy Wilkinson c9c014cde7 Drop IgnoreNestedPropertiesBindHandler and its tests
This should have been done as part of abdc239.

Closes gh-8657
8 years ago
Andy Wilkinson 8afaba0b9f Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5693acf558 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson 2c96bce5cd Address some warnings that are output during javadoc generation 8 years ago