root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
17,819 Commits 24 Branches 345 Tags 277 MiB
Commit Graph

2917 Commits

Author SHA1 Message Date
Stephane Nicoll 37f1146c31 Fix formatting 2018-07-27 00:45:31 +02:00
Madhura Bhave db1d3fa282 Merge branch '2.0.x' 2018-07-26 12:36:40 -07:00
Madhura Bhave c775ff8f60 Fix import 2018-07-26 12:33:52 -07:00
Madhura Bhave 6fe366bd64 Merge branch '2.0.x' 2018-07-26 12:19:57 -07:00
Madhura Bhave 6bd438a737 Document `@ConditionalOnProperty` limitation with collections 
Closes gh-7483
 2018-07-26 12:19:06 -07:00
Madhura Bhave 78cb802f98 Merge branch '2.0.x' 2018-07-26 11:39:42 -07:00
Madhura Bhave 57515dfa78 Fix typo 2018-07-26 11:38:23 -07:00
Stephane Nicoll f780179777 Polish contribution 
Closes gh-13904
 2018-07-26 17:22:58 +02:00
artsiom df6feb3e2a Make SpringBootConfigurationFinder public and usable with other annotations 
See gh-13904
 2018-07-26 17:07:55 +02:00
dreis2211 4bb78d5a48 Fix unchecked assignment in AutoConfigurationImportSelector 
Closes gh-13908
 2018-07-26 17:06:04 +02:00
Phillip Webb b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Stephane Nicoll 276f978261 Upgrade to Spring Data Lovelace RC1 
Closes gh-13740
 2018-07-26 13:19:16 +02:00
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet 
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
 2018-07-26 11:35:12 +01:00
Phillip Webb d37e717500 Polish 2018-07-26 11:35:12 +01:00
Stephane Nicoll 406d848406 Merge branch '2.0.x' 2018-07-26 11:30:00 +02:00
Stephane Nicoll 12f8ef1b6e Upgrade to Spring Web Services 3.0.2.RELEASE 
Closes gh-13912
 2018-07-26 11:24:47 +02:00
Stephane Nicoll 787927ba81 Upgrade to Spring Framework 5.1.0.RC1 
Closes gh-13911
 2018-07-26 11:11:58 +02:00
Stephane Nicoll 1e7aa7c4bc Fix Spring Integration imports 2018-07-25 16:25:06 +02:00
Stephane Nicoll 37f5e69173 Start building against Spring Security 5.0.7 snapshots 
See gh-13898
 2018-07-25 15:48:09 +02:00
Stephane Nicoll bdf028a2e6 Merge branch '2.0.x' 2018-07-25 15:39:01 +02:00
Stephane Nicoll 99f33d5070 Start building against Spring Data Kay snapshots 
See gh-13890
 2018-07-25 15:34:52 +02:00
Andy Wilkinson 1ab98ca33f Start building against Spring HATEOAS 0.25.0 snapshots 
See gh-13742
 2018-07-25 15:21:20 +02:00
Stephane Nicoll 56542ef809 Start building against Spring Integration 2.1.0 snapshots 
See gh-13891
 2018-07-25 14:50:14 +02:00
Stephane Nicoll 9e34938ce0 Start building against Spring Amqp 2.1.0 snapshots 
See gh-13885
 2018-07-25 14:43:25 +02:00
Stephane Nicoll 21160da9f5 Use SNAPSHOTs for upcoming releases 2018-07-25 14:32:02 +02:00
Stephane Nicoll a2494df596 Merge branch '2.0.x' 2018-07-25 11:48:20 +02:00
Stephane Nicoll e6cf082dbc Fix typo 2018-07-25 11:44:55 +02:00
dreis2211 2399092f16 Fix deprecation in UndertowServletWebServerFactory 
Closes gh-13873
 2018-07-25 10:19:42 +02:00
Stephane Nicoll af0aa11d15 Polish "Add reactive health indicator for Cassandra" 
Closes gh-13864
 2018-07-25 10:16:17 +02:00
artsiom 61c41555c8 Add reactive health indicator for Cassandra 
See gh-13864
 2018-07-25 10:16:17 +02:00
Stephane Nicoll 0c41384e50 Merge branch '2.0.x' 2018-07-25 09:18:04 +02:00
Stephane Nicoll a25b6bd473 Restore support for TransactionAwareCacheDecorator 
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-13861
 2018-07-25 09:17:49 +02:00
Madhura Bhave e524adb2fc Merge branch '2.0.x' 2018-07-24 17:43:47 -07:00
Madhura Bhave 1831f3be16 Fix NPE when Collection contains unbound children 
Fixes gh-13636
 2018-07-24 17:42:51 -07:00
Madhura Bhave eefa0ada9f Allow property overrides for OIDC Configuration Provider 
Closes gh-13869
 2018-07-24 15:11:05 -07:00
Madhura Bhave 5011bc6451 Merge branch '2.0.x' 2018-07-24 14:28:01 -07:00
Madhura Bhave 6032b454b0 Polish 2018-07-24 14:11:01 -07:00
Madhura Bhave f5617601aa Polish "Register OAuth2AuthorizedClientRepository bean" 
Closes gh-13870
 2018-07-24 13:31:03 -07:00
artsiom 2dcf19938d Register OAuth2AuthorizedClientRepository bean 2018-07-24 13:30:36 -07:00
Stephane Nicoll b163120ece Upgrade to Reactor Californium-M1 
Closes gh-12849
 2018-07-24 18:20:11 +02:00
Brian Clozel 57dbea0db3 Finalize upgrade to Reactor Netty 0.8 
This commit fixes the last issue for the upgrade to Reactor Netty 0.8.

Closes: gh-13321
 2018-07-24 14:56:23 +02:00
Brian Clozel e15ca514c8 Update HttpResources cleaning for Reactor Netty 
This commit updates the workaround for issue gh-9146
 2018-07-24 14:07:57 +02:00
Brian Clozel dd79143d1a Support http/2 configuration with Reactor-Netty 
Just like Jetty, Reactor Netty supports ALPN with JDK8 or with a
dependency that delegates TLS to a native library using boringSSL.

Closes gh-13333
 2018-07-24 14:07:57 +02:00
Stephane Nicoll c98bb40136 Adapt NoSuchBeanDefinitionFailureAnalyzer to framework change 
This commit adapts to a Spring Framework change based on SPR-11419 and
SPR-15338. Rather than throwing an exception when injecting a List or
Map of a candidate bean that is not present, an empty collection/map is
injected.
 2018-07-24 13:36:38 +02:00
Stephane Nicoll f3ef7caf09 Merge branch '2.0.x' 2018-07-24 13:35:25 +02:00
Stephane Nicoll 829ac3fbef Prevent headers to be mutated 
This commit rework 1189ccc to prevent a mutate call on the original
headers map.

Closes gh-13871
 2018-07-24 13:34:49 +02:00
Stephane Nicoll 5fb2060566 Polish "Add configuration for Tomcat's cachingAllowed property" 
Closes gh-13614
 2018-07-24 11:20:35 +02:00
Rob Tompkins 200ac6db30 Add configuration for Tomcat's cachingAllowed property 
See gh-13614
 2018-07-24 11:18:33 +02:00
Stephane Nicoll dcd230fc00 Merge branch '2.0.x' 2018-07-24 10:38:48 +02:00
Stephane Nicoll 7d2e25f6f8 Merge branch '1.5.x' into 2.0.x 2018-07-24 10:37:31 +02:00
dreis2211 d0918f87b2 Fix OAuth2WebSecurityConfigurationTests 
Closes gh-13872
 2018-07-24 09:57:42 +02:00
Stephane Nicoll 2ad548485c Merge branch '2.0.x' 2018-07-24 09:40:38 +02:00
Stephane Nicoll 1a0afc6bbe Polish "Use Collection.removeIf() where possible" 
Closes gh-13871
 2018-07-24 09:38:51 +02:00
dreis2211 1189ccc936 Use Collection.removeIf() where possible 
See gh-13871
 2018-07-24 09:38:34 +02:00
Stephane Nicoll 6dc0cb4f67 Merge branch '2.0.x' 2018-07-24 09:33:22 +02:00
Stephane Nicoll 7176c54f5e Polish "Add metric description and base unit to metrics endpoint" 
Closes gh-13813
 2018-07-24 09:32:22 +02:00
Johannes Edmeier ab1f8cf77b Add metric description and base unit to metrics endpoint 
See gh-13813
 2018-07-24 09:32:22 +02:00
Stephane Nicoll ecb8da2536 Polish "Upgrade to Micrometer 1.0.6" 
Closes gh-13819
 2018-07-24 09:25:54 +02:00
Jon Schneider f478911c54 Upgrade to Micrometer 1.0.6 
See gh-13819
 2018-07-24 09:12:06 +02:00
Stephane Nicoll ccabf83815 Merge branch '2.0.x' 2018-07-23 09:31:54 +02:00
Stephane Nicoll dcb68d4c64 Deprecate unused property 
Closes gh-13836
 2018-07-23 09:31:02 +02:00
Andy Wilkinson 70dbcba7b6 Merge branch '2.0.x' 2018-07-20 17:04:25 +01:00
Andy Wilkinson daad992c96 Merge branch '1.5.x' into 2.0.x 2018-07-20 17:03:59 +01:00
Andy Wilkinson c7f6fb8660 Upgrade to Mockito 2.19.1 
Closes gh-13859
 2018-07-20 16:39:24 +01:00
Andy Wilkinson f8c8c47351 Upgrade to Jooq 3.11.3 
Closes gh-13858
 2018-07-20 16:39:24 +01:00
Andy Wilkinson 0ea85800c4 Upgrade to Infinispan 9.3.1.Final 
Closes gh-13857
 2018-07-20 16:39:23 +01:00
Andy Wilkinson 2d340fcae1 Upgrade to Hibernate 5.3.3.Final 
Closes gh-13856
 2018-07-20 16:39:22 +01:00
Andy Wilkinson 3b79802c19 Upgrade to Flyway 5.1.4 
Closes gh-13855
 2018-07-20 16:39:22 +01:00
Andy Wilkinson 98f19fcc81 Upgrade to Elasticsearch 6.3.1 
Closes gh-13854
 2018-07-20 16:39:21 +01:00
Andy Wilkinson e9d1abf2ce Upgrade to Groovy 2.5.1 
Closes gh-13853
 2018-07-20 16:39:20 +01:00
Andy Wilkinson 921d883559 Upgrade to Kafka 1.1.1 
Closes gh-13852
 2018-07-20 16:39:20 +01:00
Andy Wilkinson 7a706b1581 Upgrade to Commons Pool2 2.6.0 
Closes gh-13851
 2018-07-20 16:39:19 +01:00
Andy Wilkinson f28ae9e4c5 Upgrade to Commons Dbcp2 2.5.0 
Closes gh-13850
 2018-07-20 16:39:19 +01:00
Andy Wilkinson 1df725fddc Upgrade to Byte Buddy 1.8.13 
Closes gh-13849
 2018-07-20 16:39:18 +01:00
Andy Wilkinson a19d340b60 Upgrade to Undertow 2.0.11.Final 
Closes gh-13848
 2018-07-20 16:39:17 +01:00
Andy Wilkinson 9d72838796 Upgrade to Hazelcast 3.10.3 
Closes gh-13847
 2018-07-20 16:39:17 +01:00
Andy Wilkinson 5e58a50311 Upgrade to Couchbase Client 2.6.0 
Closes gh-13846
 2018-07-20 16:39:16 +01:00
Andy Wilkinson 13337c648c Merge branch '2.0.x' 2018-07-20 16:35:19 +01:00
Andy Wilkinson 136be5916c Upgrade to Postgresql 42.2.4 
Closes gh-13845
 2018-07-20 16:30:17 +01:00
Andy Wilkinson 8f2a8576a6 Upgrade to Mariadb 2.2.6 
Closes gh-13844
 2018-07-20 16:30:16 +01:00
Andy Wilkinson e5a4cfabc3 Upgrade to Hibernate Validator 6.0.11.Final 
Closes gh-13843
 2018-07-20 16:30:15 +01:00
Andy Wilkinson 1c6e75ff10 Upgrade to Kafka 1.0.2 
Closes gh-13842
 2018-07-20 16:30:15 +01:00
Andy Wilkinson 4003c3c6e5 Upgrade to Jna 4.5.2 
Closes gh-13841
 2018-07-20 16:30:14 +01:00
Andy Wilkinson 3fd6f00155 Upgrade to Netty 4.1.27.Final 
Closes gh-13840
 2018-07-20 16:30:13 +01:00
Andy Wilkinson 478181eb2c Merge branch '1.5.x' into 2.0.x 2018-07-20 16:26:30 +01:00
Stephane Nicoll 0f0fc9ec62 Adapt assertion to logging change in Spring Framework 2018-07-20 17:12:56 +02:00
Stephane Nicoll 11d9a7c30d Merge branch '2.0.x' 2018-07-20 15:51:28 +02:00
Stephane Nicoll fc0a687ee0 Migrate test to ApplicationContextRunner 2018-07-20 15:51:14 +02:00
Madhura Bhave 14a0064c53 Merge branch '2.0.x' 2018-07-19 16:32:59 -07:00
Madhura Bhave 660d284f45 Document when and how to use brackets when binding to maps 
Closes gh-13506
 2018-07-19 16:31:59 -07:00
Madhura Bhave d958e83799 Merge branch '2.0.x' 2018-07-19 15:48:29 -07:00
Madhura Bhave 56235187d0 Fix typo 2018-07-19 15:47:14 -07:00
Andy Wilkinson a33dd8b9cb Merge branch '2.0.x' 2018-07-19 20:43:58 +01:00
Andy Wilkinson 10b91602e9 Increase connect and read timeouts when testing against Cassandra 2018-07-19 20:43:39 +01:00
Andy Wilkinson 1852ecc444 Merge branch '2.0.x' 2018-07-19 19:59:08 +01:00
Andy Wilkinson de7899fba4 Improve reliability by give Cassandra more time and attempts to start 2018-07-19 19:57:54 +01:00
Andy Wilkinson d11ee29fa1 Merge branch '2.0.x' 2018-07-19 18:32:49 +01:00
Andy Wilkinson bfc4cad692 Upgrade to Spring REST Docs 2.0.2.RELEASE 
Closes gh-13505
 2018-07-19 18:32:38 +01:00
Stephane Nicoll 5be84dd32b Merge branch '2.0.x' 2018-07-19 17:58:14 +02:00
Stephane Nicoll cdbe6fa122 Document properties migrator usage 
Closes gh-13600
 2018-07-19 17:57:42 +02:00
Andy Wilkinson 13835c5dc7 Upgrade to Spring Batch 4.1.0.M2 
Closes gh-13820
 2018-07-19 16:56:38 +01:00
Stephane Nicoll 1c0eb8de36 Merge branch '2.0.x' 2018-07-19 16:42:51 +02:00
Stephane Nicoll a1ef3f070a Improve documentation for using a mock environment with @SpringBootTest 
Closes gh-13827
 2018-07-19 16:40:24 +02:00
Stephane Nicoll 237f2fb494 Merge branch '2.0.x' 2018-07-19 14:55:21 +02:00
Stephane Nicoll 592754d806 Polish "Make sure exception tag values are not empty in web metrics" 
Closes gh-13187
 2018-07-19 14:53:29 +02:00
Jon Schneider ee37dc1c31 Make sure exception tag values are not empty in web metrics 
See gh-13187
 2018-07-19 14:40:58 +02:00
Stephane Nicoll bc7db86c8c Consistently apply exclude on auto-configuration 
Previously, exclude of an import selector was applied only locally. In
other words, if one import selector imports `AcmeAutoConfiguration` and
another one exclude it, it would still be imported because exclude were
applied separately

This commit collects the outcome of all auto-configuration import
selectors and then apply exclusions in a single pass.

Closes gh-12586
 2018-07-19 14:08:10 +02:00
Stephane Nicoll 184cd0c708 Avoid CGLIB requirement in MessageSourceAutoConfiguration 
Closes gh-13824
 2018-07-19 13:58:19 +02:00
Madhura Bhave ceaac98847 Update docs with OIDC provider configuration 
See gh-13210
 2018-07-18 12:27:13 -07:00
Madhura Bhave 6333edbe16 Merge branch '2.0.x' 2018-07-18 11:01:38 -07:00
Madhura Bhave 66156cc24f Polish 2018-07-18 10:29:43 -07:00
Andy Wilkinson b58314f214 Merge branch '2.0.x' 2018-07-18 14:17:35 +01:00
Andy Wilkinson 681717d07a Merge branch '1.5.x' into 2.0.x 2018-07-18 14:17:15 +01:00
Andy Wilkinson 147a08eb4c Merge branch '2.0.x' 2018-07-18 13:47:31 +01:00
Andy Wilkinson b9ad0d9992 Test the Gradle plugin against Gradle 4.8.1 instead of 4.8 
Closes gh-13809
 2018-07-18 13:34:27 +01:00
Andy Wilkinson 8deea933b9 Test the Gradle plugin against Gradle 4.9 
Closes gh-13808
 2018-07-18 13:33:39 +01:00
Andy Wilkinson 93daac7ba8 Merge branch '2.0.x' 2018-07-18 11:22:15 +01:00
Andy Wilkinson 53400b1d81 Merge branch '1.5.x' into 2.0.x 2018-07-18 11:15:40 +01:00
Madhura Bhave dcb172fe2a Merge branch '2.0.x' 2018-07-17 17:09:25 -07:00
Madhura Bhave e907ae605d Fix tests 
See gh-13783
 2018-07-17 17:08:53 -07:00
Madhura Bhave 9bd723ddad Fix exception message 
Fixes gh-13783
 2018-07-17 17:05:29 -07:00
Madhura Bhave 9b6a069903 Merge branch '2.0.x' 2018-07-17 16:54:43 -07:00
Johnny Lim 86ccb26c58 Polish EndpointRequest.RequestMatcherFactory.antPath() 
Closes gh-13775
 2018-07-17 16:53:33 -07:00
Madhura Bhave ddce819e6f Merge branch '2.0.x' 2018-07-17 16:44:23 -07:00
Madhura Bhave c36804908c Merge branch '1.5.x' into 2.0.x 2018-07-17 16:43:02 -07:00
Madhura Bhave f88ebc06ff Add support for OIDC Configuration Provider 
Closes gh-13210
 2018-07-17 16:02:03 -07:00
Madhura Bhave 4fee54cf24 Expose a TestDispatcherServlet bean in the MockMvcAutoConfiguration 
This commit also contains changes to `ServletContextInitializerBeans`.
`ServletContextInitializerBeans` can now be configured to only look
for specific ServletContextInitializer subclasses, defaulting to
ServletContextIntializer.class. `SpringBootMockMvcBuilderCustomizer`
only cares about filters so it was unnecessary to look for all
`ServletContextInitializer`s. Additionally, adapting `Servlet` beans
caused a cycle once the `DispatcherServlet` bean was added and the
customizer only needs to adapt `Filter` beans.

Closes gh-13241
 2018-07-17 13:00:54 -07:00
Andy Wilkinson 6a189cee06 Merge branch '2.0.x' 2018-07-17 19:26:08 +01:00
Andy Wilkinson a57d0f0853 Reinstate order of WebMvcMetricsFilter 
Closes gh-13781
 2018-07-17 19:14:17 +01:00
Stephane Nicoll a98b020ee4 Merge branch '2.0.x' 2018-07-17 17:04:49 +02:00
Stephane Nicoll 944ed767ac Add dependency management for elasticsearch integration tests distro 
Closes gh-13547
 2018-07-17 17:03:45 +02:00
Stephane Nicoll 526b50645e Merge branch '2.0.x' 2018-07-17 15:48:26 +02:00
dreis2211 e9a8d4c949 Remove unused AbstractCouchbaseAutoConfigurationTests 
Closes gh-13797
 2018-07-17 15:48:00 +02:00
Stephane Nicoll 8bf22db9c3 Merge branch '2.0.x' 2018-07-17 15:46:20 +02:00
Stephane Nicoll 6e749ef276 Improve NoSuchBeanDefinitionFailureAnalyzer to handle null beans 
Previously, if a user defines a `@Bean` with a method that returns
`null`, injection by type will ignore that definition but the report
doesn't mention that candidate.

This commit improves the failure analyzer to look for user-defined beans
as well, detecting beans that are `null` matching the requested type
and including them in the report.

Closes gh-13531
 2018-07-17 15:45:49 +02:00
Stephane Nicoll c0b9c72d74 Merge branch '2.0.x' 2018-07-17 14:07:34 +02:00
Stephane Nicoll e679690a74 Clarify the WebTestClient requires WebFlux on the classpath 
Closes gh-13469
 2018-07-17 14:06:41 +02:00
Stephane Nicoll 070c26d6c3 Merge branch '2.0.x' 2018-07-17 12:03:58 +02:00
Stephane Nicoll d6c7eff8f7 Add check for empty values for lookup 
Closes gh-13419
 2018-07-17 12:01:26 +02:00
Stephane Nicoll ada699a9f6 Allow to customize the RabbitMQ RetryTemplate 
This commit adds the ability to customize the RetryTemplate used in the
RabbitMQ infrastructure. The customizer is slightly unusual and offer
a `Target` enum that define the component that will use the retry
template: `SENDER` for the auto-configured `RabbitTemplate` and
`LISTENER` for a listener container created by a
`RabbitListenerContainerFactoryConfigurer`.

Closes gh-13793
 2018-07-17 11:31:20 +02:00
Stephane Nicoll fd6023fe49 Polish contribution 
Closes gh-13790
 2018-07-17 10:25:55 +02:00
Johnny Lim 58df752af4 Polish 
See gh-13790
 2018-07-17 10:25:38 +02:00
Stephane Nicoll 43091150d8 Merge branch '2.0.x' 2018-07-17 10:23:12 +02:00
Stephane Nicoll 8095ee4a5b Polish contribution 
See gh-13790
 2018-07-17 10:12:34 +02:00
Johnny Lim f363fe7dd1 Polish 
See gh-13790
 2018-07-17 10:03:41 +02:00
Stephane Nicoll ac01409332 Merge branch '2.0.x' 2018-07-17 08:22:58 +02:00
Stephane Nicoll ec2ebf52de Merge branch '1.5.x' into 2.0.x 2018-07-17 08:22:15 +02:00
Brian Clozel 624cbe08d5 Merge branch '2.0.x' 2018-07-16 23:37:31 +02:00
Brian Clozel 58e886fddf Remove @Lazy injection for HttpMessageConverters 
This commit turns a lazy injection point for `HttpMessageConverters`
into an `ObjectProvider`-backed injection.

This allows to lazily rely on that bean without creating for it; in some
environments, such proxy creation can lead to issues like SPR-16990.

See gh-13785
 2018-07-16 23:12:47 +02:00
Stephane Nicoll b7274966c4 Merge branch '2.0.x' 2018-07-16 14:12:36 +02:00