Commit Graph

7167 Commits

Author SHA1 Message Date
Stephane Nicoll d254c62712 Polish tests 2019-10-22 14:27:25 +02:00
Stephane Nicoll 6e6f4f763c Remove useless attribute override
This commit removes the override proxyBeanMethods as the aliased
attribute is taking precedence.
2019-10-22 14:04:20 +02:00
Stephane Nicoll 4d5d90847e Merge branch '2.1.x'
Closes gh-18682
2019-10-22 09:41:04 +02:00
wycm 681a94b0d5 Optimize debug level logs
See gh-18604
2019-10-22 09:36:48 +02:00
Stephane Nicoll c05f88bf78 Polish "Add missing package-info files"
See gh-18632
2019-10-22 09:35:10 +02:00
Leo Li af114c93ee Add missing package-info files
See gh-18632
2019-10-22 09:30:04 +02:00
Alessandro Falappa f28af3db9f Narrow type for Tomcat 'locale' and 'encoding' properties
See gh-18637
2019-10-22 09:22:48 +02:00
Stephane Nicoll fd94608f73 Polish "Restore proxying of @Bean methods in @TestConfiguration"
See gh-18675
2019-10-22 09:13:00 +02:00
Dmytro Nosan 7faa606920 Restore proxying of @Bean methods in @TestConfiguration
See gh-18675
2019-10-22 09:10:05 +02:00
Stephane Nicoll bd4dc1ef2a Merge branch '2.1.x'
Closes gh-18669
2019-10-21 09:19:50 +02:00
xiaokeliu666 57c64eb3bc Polish
See gh-18665
2019-10-21 09:15:16 +02:00
Andy Wilkinson 03f5791860 Merge branch '2.1.x'
Closes gh-18650
2019-10-18 10:37:39 +01:00
dreis2211 d17f11dbe1 Test the Gradle Plugin against Gradle 5.6.3
See gh-18648
2019-10-18 10:35:54 +01:00
Andy Wilkinson 53dea36252 Upgrade to Undertow 2.0.27.Final
Closes gh-18626
2019-10-16 16:16:23 +01:00
Andy Wilkinson 62d78d0570 Upgrade to Spring Session Corn-RELEASE
Closes gh-18525
2019-10-16 16:11:58 +01:00
Andy Wilkinson 2cdf801e7f Add a note to the docs about combining multiple security components
Previously, the documentation did not describe how to combine
multiple security components when one component's
WebSecurityConfigurerAdapter or SecurityWebFilterChain would cause
the other components' beans of the same type to back off.

This commit adds a note that such cases should be handled by the user
defining their own WebSecurityConfigurerAdapter or
SecurityWebFilterChain that configures the use of all of the
components as required.

Closes gh-18507
2019-10-16 16:09:13 +01:00
Brian Clozel 1529ba14c8 Rename server.jetty.idle-timeout
This commit renames the `server.jetty.idle-timeout` property to
`server.jetty.thread-idle-timeout`, since there are other timeout
properties that are not tied to the threadpool configuration (e.g. the
connection idle timeout).

We might regroup thread-related properties in a dedicated group in the
future, see gh-18620.

Fixes gh-18615
2019-10-16 14:57:05 +02:00
Andy Wilkinson 49a6131a98 Merge pull request #18619 from izeye
* gh-18619:
  Remove accidental JavaVersion.current() call in BootRun

Closes gh-18619
2019-10-16 13:41:56 +01:00
Johnny Lim 137538f415 Remove accidental JavaVersion.current() call in BootRun
It was added accidentally in d2b28ceb.

See gh-18619
2019-10-16 13:40:21 +01:00
Andy Wilkinson fd1d653c34 Rename socket factory processor methods on NettyRSocketServerFactory
Previously, the methods were named addServerProcessors and
setServerProcessors which wasn't aligned with them taking
socket factory processors (ServerRSocketFactoryProcessor) as an
argument.

This commit renames the methods to align them more closely with the
type of their arguments.

Closes gh-18617
2019-10-16 13:39:42 +01:00
Brian Clozel 7104b8385f Merge branch '2.1.x' 2019-10-16 14:37:26 +02:00
Brian Clozel 9c5ee1126f Polish
See gh-18473
2019-10-16 14:36:19 +02:00
Brian Clozel 7113d41a80 Merge branch '2.1.x'
Closes gh-18618
2019-10-16 14:09:46 +02:00
Brian Clozel e4fa9ce8c6 Deprecate server.connection-timeout property
Prior to this commit, all supported servers would share the same
configuration property `server.connection-timeout`. Unfortunately, in
many cases the behavior of this timeout changes depending on the server.
From actual connection setup timeout, to detecting and closing idle
connections, this property cannot be properly translated from one server
implementation to another.

This commit deprecates this configuration property and introduces server
specific properties:

* `server.jetty.connection-idle-timeout`
(Time that the connection can be idle before it is closed.)
* `server.netty.connection-timeout`
(Connection timeout of the Netty channel.)
* `server.tomcat.connection-timeout`
(Amount of time the connector will wait, after accepting a connection,
for the request URI line to be presented.)
* `server.undertow.no-request-timeout`
(Amount of time a connection can sit idle without processing a request,
before it is closed by the server.)

`server.connection-timeout` is now deprecated and will be removed in a
future release.

Fixes gh-18473
2019-10-16 13:48:48 +02:00
Stephane Nicoll 64401216b0 Merge branch '2.1.x'
Closes gh-18614
2019-10-16 10:58:03 +02:00
contextshuffling a8c6540191 Use LinkedHashSet for deterministic order in test assertion
See gh-18612
2019-10-16 10:47:58 +02:00
Andy Wilkinson 6af56a8f07 Upgrade to Netty 4.1.42.Final
Closes gh-18609
2019-10-15 20:42:57 +01:00
Andy Wilkinson 4b4b39853b Merge branch '2.1.x'
Closes gh-18608
2019-10-15 19:47:41 +01:00
Andy Wilkinson 00d4b44cbb Remove trailing commas from test SQL scripts
Closes gh-18607
2019-10-15 19:47:27 +01:00
Andy Wilkinson 15db8d8b0c Upgrade to Spring Kafka 2.3.1.RELEASE
Closes gh-18526
2019-10-15 19:39:35 +01:00
Andy Wilkinson 6e84ae6474 Make SAML 2 login configuration back off with user provider config adapter
Previously, a WebSecurityConfigurerAdapter would be configured
irrespective of whether or not the user had provided their own
WebSecurityConfigurerAdapter. This then required them to use ordering
to diambiguate the configuration and made it harder to take complete
control of security configuration.

This commit updates the configuration of the SAML 2 login configurer
adapter to be conditional on missing bean, aligning it with other
security configuration such as the equivalent OAuth 2 configurer
adapter.

Closes gh-18530
2019-10-15 16:52:18 +01:00
Andy Wilkinson 07d0794827 Consider possibility of missing @ConstructorBinding in failure analysis
Previously, when a NoSuchBeanDefinitionException was being analyzed,
the possibility of a missing @ConstructorBinding annotation on a
@ConfigurationProperties class was not considered.

This commit updates the failure analysis for failed constructor
injection of an instance of a @ConfigurationProperties-annotated
class. When such a failure occurs, adding @ConstructorBinding is
now suggested as an action.

Closes gh-18545
2019-10-15 13:48:20 +01:00
Andy Wilkinson 04e035caff Upgrade to Mongodb 3.11.1
Closes gh-18602
2019-10-15 13:48:20 +01:00
Andy Wilkinson e7ea1f32f7 Upgrade to Mimepull 1.9.12
Closes gh-18601
2019-10-15 13:48:20 +01:00
Andy Wilkinson e542cedc49 Upgrade to Flyway 6.0.6
Closes gh-18600
2019-10-15 13:48:20 +01:00
Andy Wilkinson bbae38c0fa Upgrade to Tomcat 9.0.27
Closes gh-18599
2019-10-15 13:48:20 +01:00
Andy Wilkinson 76651f28e5 Upgrade to Johnzon Jsonb 1.2.1
Closes gh-18598
2019-10-15 13:48:19 +01:00
Andy Wilkinson f7a87be1fe Upgrade to Mysql 8.0.18
Closes gh-18597
2019-10-15 13:48:19 +01:00
Andy Wilkinson 92b4e60ecd Upgrade to Rxjava2 2.2.13
Closes gh-18596
2019-10-15 13:48:19 +01:00
Andy Wilkinson 608f02f060 Upgrade to Unboundid Ldapsdk 4.0.12
Closes gh-18595
2019-10-15 13:48:19 +01:00
Andy Wilkinson 8091183c1f Upgrade to Hazelcast 3.12.3
Closes gh-18594
2019-10-15 13:48:19 +01:00
Andy Wilkinson eafa595ed3 Upgrade to Gson 2.8.6
Closes gh-18592
2019-10-15 13:48:19 +01:00
Stephane Nicoll 0bc5803e34 Merge branch '2.1.x'
Closes gh-18603
2019-10-15 14:38:59 +02:00
Stephane Nicoll e4ba6049ff Clarify scope of "@SpringBootTest#classes"
See gh-18229
2019-10-15 14:36:28 +02:00
Stephane Nicoll 2bf8073446 Polish
See gh-18440
2019-10-15 14:08:38 +02:00
Andy Wilkinson b240c810a8 Fix @ConfigurationProperties on @Bean methods without metadata caching
Due to a current limitation of Spring Framework, when bean metadata
caching is disabled, a merged bean definition may have a null
resolved factory method that would have been non-null if bean metadata
caching was enabled. Configuration property binding for @Bean methods
annotated with @ConfigurationProperties relied upon the resolved
factory method being enabled to find the @ConfigurationProperties
annotation and trigger property binding. As a result, when bean
metadata caching is disabled on the bean factory, such
@ConfigurationProperties beans would not be bound.

This commit works around the limitation by adding a fallback that
performs a reflection-based search for the factory method when the
resolved factory method on the bean definition is null. This allows
the bean's factory method and any @ConfigurationProperties annotation
on it to be found, ensuring that propoerty binding is then performed.

Fixes gh-18440
2019-10-15 11:21:53 +01:00
Stephane Nicoll 4efb4d1dd3 Polish "Add some more notes on running exploded jar files"
See gh-18477
2019-10-15 10:02:53 +02:00
Dave Syer 3f2dd30808 Add some more notes on running exploded jar files
See gh-18477
2019-10-15 10:01:23 +02:00
Stephane Nicoll 391eb279df Merge branch '2.1.x'
Closes gh-18588
2019-10-15 08:51:31 +02:00
Stephane Nicoll 22f44917ca Polish "Add metadata entry for spring.main.register-shutdown-hook"
See gh-18581
2019-10-15 08:41:07 +02:00
leoli 9b781449cf Add metadata entry for spring.main.register-shutdown-hook
See gh-18581
2019-10-15 08:37:08 +02:00
Stephane Nicoll 75bd15650f Merge branch '2.1.x'
Closes gh-18587
2019-10-15 08:33:51 +02:00
Stephane Nicoll f05d7902e2 Polish "Clarify formatting recommendations for configuration property javadoc"
See gh-18578
2019-10-15 08:32:48 +02:00
Rafiullah Hamedy 1f9b68707f Clarify formatting recommendations for configuration property javadoc
This commit adds a note to spring-boot-features.adoc to clarify that
using javadoc tags to format configuration property descriptions is not
supported.

See gh-18578
2019-10-15 08:29:51 +02:00
Stephane Nicoll 98f676ca46 Merge branch '2.1.x'
Closes gh-18586
2019-10-15 08:25:25 +02:00
contextshuffling efedd80d4b Use LinkedHashSet for deterministic order in test assertions
See gh-18580
2019-10-15 08:20:53 +02:00
Stephane Nicoll 9c6e5f0904 Merge branch '2.1.x'
Closes gh-18585
2019-10-15 08:15:42 +02:00
dreis2211 abfb87d1a3 Rename tests to match Surefire expectations
See gh-18579
2019-10-15 08:11:47 +02:00
Phillip Webb e20aa7dc73 Clarify ConfigurationPropertiesBean Javadoc
Update the `ConfigurationPropertiesBean` Javadoc to clarify its purpose.

Closes gh-18487
2019-10-14 20:50:42 -07:00
Andy Wilkinson 3fc51f8063 Isolate the effects of initializing Reactor's debug agent in the tests 2019-10-14 20:08:59 +01:00
Andy Wilkinson e7efe0cbfe Merge branch '2.1.x'
Closes gh-18576
2019-10-14 14:12:57 +01:00
王洋 152568521e Make the logger static final
See gh-18575
2019-10-14 14:12:26 +01:00
Andy Wilkinson 65818038fe Polish "Update Kotlin-related reference documentation"
See gh-18573
2019-10-14 11:41:03 +01:00
Sebastien Deleuze c6c9818285 Update Kotlin-related reference documentation
See gh-18573
2019-10-14 11:40:38 +01:00
Andy Wilkinson c75b06c76c Remove @ImmutableConfigurationProperties
Closes gh-18563
2019-10-14 11:29:09 +01:00
Andy Wilkinson cf62dc862b Polish "Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration"
See gh-18571
2019-10-14 09:34:53 +01:00
dreis2211 35dc4817dd Correct Mono import in LegacyHealthEndpointCompatibilityConfiguration
See gh-18571
2019-10-14 09:34:10 +01:00
Stephane Nicoll 8108b556ad Fix resource cleanup in test
Closes gh-18569
2019-10-13 13:41:50 +02:00
Stephane Nicoll f7959bcd00 Merge branch '2.1.x'
Closes gh-18567
2019-10-13 08:45:44 +02:00
Ted M. Young f553784ebc Fix incorrect backslash escape in documentation sample
See gh-18546
2019-10-13 08:10:14 +02:00
dreis2211 d8de6fff53 Polish
See gh-18557
2019-10-12 16:55:07 +01:00
dreis2211 3174f06bf2 Remove usage of @InjectMocks
See gh-18557
2019-10-12 16:54:57 +01:00
Johnny Lim 887c3b71f3 Fix matchesNestedConfigurationClassWithoutTestMethodsIfItHasTestable()
See gh-18559
2019-10-12 16:51:53 +01:00
Andy Wilkinson 9a89039172 Provide a marker artifact for Boot's Gradle plugin
Closes gh-18514
2019-10-11 16:51:29 -05:00
Stephane Nicoll 61a914fa28 Polish 2019-10-11 10:39:23 -05:00
Stephane Nicoll 40bd98a3f4 Polish "Remove boxing"
See gh-18552
2019-10-11 10:35:19 -05:00
clove506 fe6da39e1b Remove boxing
See gh-18552
2019-10-11 10:32:59 -05:00
Johnny Lim d60d59434d Polish
See gh-18531
2019-10-11 10:29:22 -05:00
leoli 2b5f8f36a2 Fix ImmutableConfigurationProperties import statement in ref docs
See gh-18548
2019-10-10 07:34:46 -05:00
Andy Wilkinson e62ca778e9 Merge branch '2.1.x'
Closes gh-18554
2019-10-10 07:29:57 -05:00
dreis2211 ba46ab6a4f Remove accidental usage of UnsupportedOptionException
See gh-18539
2019-10-10 07:28:51 -05:00
dreis2211 09b9d18d88 Fix formatting issue
See gh-18544
2019-10-08 14:11:50 -05:00
dreis2211 e70a5686bf Fix checkstyle warning
See gh-18541
2019-10-08 12:21:05 -05:00
Stephane Nicoll 32a1cdf4d3 Polish "Use dedicated method to turn off authentication"
See gh-18538
2019-10-08 11:13:51 -05:00
Michael Simons 04a01a49c2 Use dedicated method to turn off authentication
See gh-18538
2019-10-08 11:08:48 -05:00
Andy Wilkinson b5243c5076 Polish "Polish"
See gh-18534
2019-10-08 07:38:53 -05:00
Kant Leung 2f73e196af Polish
See gh-18534
2019-10-08 07:38:21 -05:00
Johnny Lim e9e6c925e8 Remove a duplicate assertion
See gh-18524
2019-10-07 08:19:11 -05:00
Andy Wilkinson 002b2709d9 Document auditevent and httptrace endpoints' need for repositories
Closes gh-18352
2019-10-07 07:22:10 -05:00
Andy Wilkinson 8b9890eb5d Remove Woodstox dependency management after Jackson upgrade
The upgrade to Jackson 2.10.0 means that the possibility of getting
an incompatible combination of Woodstox and the StAX API when
building with Maven has gone. This commit removes the dependency
management as it was only added to work around the incompatibility
in Jackson's transitive dependencies.

Closes gh-18500
2019-10-03 17:39:55 +01:00
Andy Wilkinson 078536aded Merge branch '2.1.x'
Closes gh-18502
2019-10-03 15:34:32 +01:00
Andy Wilkinson f42b442ce2 Fix handling of encoded URLs in Class-Path manifest attribute
Fixes gh-18410
2019-10-03 15:30:33 +01:00
Andy Wilkinson bc8a88d734 Upgrade to Webjars Locator Core 0.41
Closes gh-18497
2019-10-03 08:27:51 +01:00
Andy Wilkinson b7e434d5f8 Upgrade to Mockito 3.1.0
Closes gh-18496
2019-10-03 08:27:50 +01:00
Andy Wilkinson 2d08842ad7 Upgrade to Hibernate 5.4.6.Final
Closes gh-18495
2019-10-03 08:27:50 +01:00
Andy Wilkinson a73f7829eb Upgrade to Johnzon Jsonb 1.2.0
Closes gh-18493
2019-10-03 08:11:21 +01:00
Andy Wilkinson a907519ff5 Upgrade to Okhttp3 3.14.4
Closes gh-18492
2019-10-03 08:11:20 +01:00
Phillip Webb be7a7bb2e9 Refine String to File conversion support
Refine the conversion support so that file URLs are support without
reintroducing gh-12163.

Closes gh-16931
2019-10-02 22:45:22 -07:00
Johnny Lim 701bd0dd46 Polish
See gh-18490
2019-10-02 22:15:05 -07:00
Phillip Webb 946202bd42 Polish 'Support 'New Relic' eventType properties'
See gh-18472
2019-10-02 22:12:53 -07:00