Commit Graph

8377 Commits

Author SHA1 Message Date
Stephane Nicoll ed96d142b8 Upgrade to Spring Integration 4.3.0.RELEASE
Closes gh-5079
2016-06-14 08:33:39 +02:00
Stephane Nicoll 64bbefd3ac Add Jest-based health indicator
This commit adds a Jest-based health indicator for ElasticSearch. If both
Jest and the Spring Data are available, the latter takes precedence as it
provides more information.

Closes gh-3178
2016-06-13 17:19:04 +02:00
Stephane Nicoll 7afe1d16a6 Add Jest support
This commit adds auto-configuration support for Jest, an HTTP client for
Elasticsearch. If Jest is present, a `JestClient` targeting a local
elasticsearch instance is auto-configured. Several properties from the
`spring.jest.*` namespace allows to tune the client.

Closes gh-6032
2016-06-13 15:25:10 +02:00
Andy Wilkinson 50ca35bdae Remove use of deprecated API in REST Docs auto-config test
Closes gh-6128
2016-06-13 11:14:12 +01:00
Stephane Nicoll 0fd7739ec7 Polish doc
See gh-6147
2016-06-12 09:04:30 +02:00
Stephane Nicoll a4035f6b93 Merge pull request #6117 from mkopylec:master
* pr/6117:
  Charon reverse proxy starter added to docs
2016-06-11 16:18:48 +02:00
Mariusz Kopylec d01e3044eb Charon reverse proxy starter added to docs
Closes gh-6117
2016-06-11 16:18:11 +02:00
Phillip Webb ee319a6d8b Merge branch '1.3.x' 2016-06-10 21:11:00 -07:00
Phillip Webb b11457f5a2 Merge pull request #6118 from joshiste/1.3.x-liquibase-endpoint
* 1.3.x-liquibase-endpoint:
  Close connection after use in LiquibaseEndpoint
2016-06-10 21:04:31 -07:00
Johannes Edmeier e89063cc07 Close connection after use in LiquibaseEndpoint
Update LiquibaseEndpoint so that connections are closed and returned to
the pool after use.

Fixes gh-6118
2016-06-10 21:03:15 -07:00
Phillip Webb 10f8a2f6bd Merge branch '1.3.x' 2016-06-10 20:58:50 -07:00
Phillip Webb 452281ca8d Fix property detection in SpringApplicationBuilder
Update SpringApplicationBuilder so that properties of the form
`abc=d:e:f` are correctly parsed. Prior to this commit the `:` delimiter
would always be chosen over `=`, even if `=` occurred first.

Fixes gh-6121
2016-06-10 20:54:50 -07:00
Phillip Webb 9f30633921 Use AssertJ in merged 1.3.x tests 2016-06-10 17:37:49 -07:00
Phillip Webb e27bc9ddea Merge branch '1.3.x' 2016-06-10 17:24:02 -07:00
Phillip Webb f27bdcb737 Prevent APT crashes on older Java versions
Update TypeUtils to guard against the use of older Java versions.
Both `Collection` and `Map` type lookups now fallback to generic free
versions of the classes.

Prior to this commit using `xmlbeans-maven-plugin` in combination with
Spring Boot's annotation processor could result in
`IllegalArgumentException: Incorrect number of type arguments`.

Fixes gh-6122
2016-06-10 17:06:45 -07:00
Phillip Webb a9b98cada5 Allow loading from package names without dots
Update BeanDefinitionLoader to support loading from package names that
do not contain dots.

Prior to this commit `new BeanDefinitionLoader(registry, "somepackage")`
would fail because "somepackage" exists and is a resource but does not
contain valid XML. Somewhat surprisingly the InputStream returned by
the resource actually contains the listing of files in the package.

Fixes gh-6126
2016-06-10 12:28:23 -07:00
Ivan Sopov 1528764194 Fix potential offset errors in BasicJsonParser
Update BasicJsonParser to fix potential exceptions if strings happen
to be empty.

Fixes gh-6136
2016-06-10 11:48:06 -07:00
Phillip Webb ed6f11d60d Polish 2016-06-10 11:46:26 -07:00
Brian Clozel 6dc0ecb182 Add WebMvcRegistrations for custom MVC components
Add `WebMvcRegistrations` which can be used to provide custom
instances of `RequestMappingHandlerMapping`,
`RequestMappingHandlerAdapter` and `ExceptionHandlerExceptionResolver`.
Those instances are then used and processed by the Boot MVC
configuration.

Prior to this commit, developers could provide their custom instances
of MVC infrstructure components such as `RequestMappingHandlerMapping`
and `RequestMappingHandlerAdapter` only by using advanced configuration
strategies. Those advanced configurations involved subclassing
`WebMvcConfigurationSupport` which effectively turns off MVC
auto-configuration in Boot.

Fixes gh-5004
Closes gh-6100
2016-06-10 10:40:06 -07:00
Stephane Nicoll 5250fb127a Fix broken condition
See gh-6041
2016-06-10 17:39:23 +02:00
Stephane Nicoll f9288a3af1 Revert "Polish maven repositories definition"
This commit reverts 62fa602fea

See gh-6031
2016-06-10 17:25:31 +02:00
Stephane Nicoll 6cf878424f Fix SSL cipher configuration with Jetty 9.3
Previously, if a list of ciphers were configured, the default excludes
were still applied. Prior to Jetty 9.3, there were no default exclude but
Jetty 9.3 introduced some and they override the includes.

This commit makes sure that the exclude ciphers are cleared if at least
one cipher is explicitly configured.

Closes gh-6041
2016-06-10 16:28:42 +02:00
Stephane Nicoll 62fa602fea Polish maven repositories definition
Previously, Maven repositories definition was specified in a profile that
is active by default. It means that as soon as any profile is enabled by
the user, said profile is no longer enabled. This has the nasty
consequences of having copy/paste in several places to make sure our own
profiles still have the proper repositories definition.

This commit creates a single "repositories" profile that is always active
unless a given property is explicitely specified. This allows to remove
the duplication and make things more consistent.

Some Gradle-specific repositories were also hard-coded in two modules
without any profile at all, meaning they were polluting the build of
anybody using it. While the impacted modules are gradle specific, that
repository has been shared in the new "repositories" profile as well.

Closes gh-6031
2016-06-10 11:55:46 +02:00
Stephane Nicoll 76cdf2212b Upgrade to Spring Framework 4.3.0.RELEASE
Closes gh-6049
2016-06-10 11:48:52 +02:00
Phillip Webb 57bed2e5f6 Use fully qualified checkstyle class names
Update `checkstyle.xml` to use fully qualified class names. This reduces
the number of warning log messages when running `mvn -X` and should also
be slightly faster.
2016-06-09 21:03:28 -07:00
Phillip Webb f19e261bcf Move AnsiOutputApplicationListenerTests
Move AnsiOutputApplicationListenerTests to the correct package.
2016-06-09 21:02:28 -07:00
Phillip Webb 99c6194e17 Don't use MockitoJUnitRunner
Replace `@RunWith(MockitoJUnitRunner.class)` with direct Mockito
initialization since the running doesn't support parallel test
execution.
2016-06-09 20:55:59 -07:00
Phillip Webb 77f6b4c983 Formatting 2016-06-09 20:45:37 -07:00
Phillip Webb c66da65e23 Refine ApplicationHome detection logic
Update the detection logic used in ApplicationHome to:
- Deal with `!/` elements in URLs so that `BOOT-INF/classes` packaging
  works as expected.
- Use the `start-class` when no explicit source class is provided to
  prevent accidentally picking a home next to a `spring-boot.jar` that
  happens to be on the classpath.
- Ignore search logic when running from a unit test.

Fixes gh-6129
2016-06-09 20:45:37 -07:00
Stephane Nicoll 17dfec7c4e Resume building against Spring Data Hopper snapshots
See gh-6132
2016-06-09 15:54:32 +02:00
Stephane Nicoll 40ff3f420a Upgrade to Spring HATEOAS 0.20.RELEASE
Closes gh-5759
2016-06-09 15:50:09 +02:00
Stephane Nicoll 8ea5524d6a Polish 2016-06-09 15:30:28 +02:00
Stephane Nicoll 72e4064230 Merge branch '1.3.x' 2016-06-09 14:17:49 +02:00
Stephane Nicoll ec4c8bf50d Merge pull request #6125 from vpavic:gh-6124
* pr/6125:
  Update DataSourceBuilder aliases
2016-06-09 14:17:24 +02:00
Vedran Pavic 6dde498b87 Update DataSourceBuilder aliases
This commit adds a `user` alias for the `username` property which permits
the use of `OracleDataSource`.

Closes gh-6124, gh-6027, gh-6125
2016-06-09 14:16:21 +02:00
Brian Clozel 091664078f Split up DispatcherServletConfiguration condition
Prior to this commit, defining a custom `DispatcherServlet` and/or a
`ServletRegistrationBean` with the default name would turn off
completely the `DispatcherServletAutoConfiguration`.

This commit splits this auto-configuration in two parts:

- First, a `DispatcherServlet` is automatically registered if no
instance is already defined with the default name.
- Then, a `ServletRegistrationBean` is registered is registered if a
`DispatcherServlet` instance exists with the default name *and* no
`ServletRegistrationBean` exists with the default name

This allows developers to register manually a `ServletRegistrationBean`
or a `DispatcherServlet` without having to redefine the whole
auto-configuration.

Fixes gh-4893
Closes gh-6108
2016-06-08 14:10:53 -07:00
Phillip Webb d87287fe72 Polish 2016-06-08 09:54:36 -07:00
Phillip Webb 5ab072be9c Polish 2016-06-08 09:27:40 -07:00
Stephane Nicoll 6a291777da Merge pull request #6066 from izeye:polish-20160530
* pr/6066:
  Polish
2016-06-07 08:41:19 -04:00
Johnny Lim 8704e4869d Polish
Closes gh-6066
2016-06-07 08:40:47 -04:00
Phillip Webb 0fa4d2e260 Make SocialAutoConfigurerAdapter/Properties public
Fixes gh-6078
2016-06-06 19:39:46 -07:00
Phillip Webb 454d8581d0 Use defined Locale for BindFailureAnalyzerTests
Update BindFailureAnalyzerTests so that localized messages are not used.

Fixes gh-6106
2016-06-06 18:07:14 -07:00
Dave Syer 6712de586b Merge remote-tracking branch 'origin/1.3.x' 2016-06-03 13:56:03 +01:00
Dave Syer 31fc1cc6f2 Update Spring OAuth to 2.0.10 2016-06-03 13:50:07 +01:00
Stephane Nicoll 483da2615b Merge pull request #6114 from izeye:typo-20160603
* pr/6114:
  Fix typos
2016-06-03 07:20:59 -04:00
Johnny Lim 5de9516255 Fix typos
Closes gh-6114
2016-06-03 07:20:39 -04:00
Andy Wilkinson ce68fdf515 Merge branch '1.3.x' 2016-06-01 18:14:00 +01:00
Andy Wilkinson 1037239efc Upgrade to Dependency Management Plugin 0.5.7.RELEASE
Closes gh-6105
2016-06-01 18:13:25 +01:00
Andy Wilkinson 277ceb7425 Merge branch '1.3.x' 2016-06-01 18:10:44 +01:00
Andy Wilkinson 9bbdbae178 Merge pull request #6056 from Martin Lippert
* gh-6056:
  Check factory method metadata to avoid NPE in devtools condition
2016-06-01 18:09:02 +01:00