Commit Graph

11013 Commits

Author SHA1 Message Date
Andy Wilkinson 94884f201c Merge branch '2.3.x'
Closes gh-23599
2020-10-06 14:36:09 +01:00
Andy Wilkinson 2d3291fb83 Merge branch '2.2.x' into 2.3.x
Closes gh-23598
2020-10-06 14:35:49 +01:00
Andy Wilkinson 7ac14203ab Expand Gradle plugin's docs on setting bootRun's system properties
Closes gh-23578
2020-10-06 14:35:30 +01:00
Stephane Nicoll 35d41e4ae2 Remove code deprecated in Spring Boot 2.2
Closes gh-22034
2020-10-06 08:17:10 +02:00
Stephane Nicoll b08da63da5 Polish 2020-10-05 17:37:11 +02:00
Andy Wilkinson 1d610fe1c8 Add configuration properties for Flyway 7's new config options
Closes gh-23579
2020-10-05 15:26:20 +01:00
Andy Wilkinson 847aecf621 Upgrade to Flyway 7.0.0
Closes gh-23514
2020-10-05 15:26:19 +01:00
Stephane Nicoll d952a8f3a5 Avoid unnecessary reflection in builders
Closes gh-23560
2020-10-05 16:16:40 +02:00
Stephane Nicoll ebc9c575e3 Allow to customize RSocketServer's fragment size
Closes gh-23247
2020-10-05 13:58:57 +02:00
Stephane Nicoll 5feaf2bc1a Polish "Polish empty string checks"
See gh-23550
2020-10-05 10:42:19 +02:00
Santhoshkumar. P 5cb07e292d Polish empty string checks
See gh-23550
2020-10-05 10:38:47 +02:00
Stephane Nicoll 294af45bb3 Replace reflection call in HttpMessageConverters
Closes gh-23485
2020-10-05 10:26:22 +02:00
dreis2211 ecee9c0f9b Avoid unnecessary explicit initialization of Atomics
Constructor calls like new AtomicInteger(0) cause a volatile write that
can be saved in cases where the constructor parameter is the default
value.

See gh-23575
2020-10-02 16:43:34 +02:00
Stephane Nicoll 6f08e9709e Polish "Improve Cassandra health indicator with more robust mechanism"
See gh-23041
2020-10-02 16:11:31 +02:00
tomekl007 8e5a041bb4 Improve Cassandra health indicator with more robust mechanism
See gh-23041
2020-10-02 15:46:48 +02:00
dreis2211 efbbd8b367 Improve performance of DispatcherServletRegistrationCondition
See gh-23554
2020-10-02 10:47:03 +02:00
Stephane Nicoll c4e1b4f5dd Polish "Add configuration option for channelRpcTimeout"
See gh-23564
2020-10-02 10:14:05 +02:00
Jasmine Howard baa9d129f2 Add configuration option for channelRpcTimeout
This commit adds a configuration option to configure
RabbitConnectionFactory's channelRpcTimeout property.

See gh-23564
2020-10-02 10:12:39 +02:00
Stephane Nicoll 1e2ed8ab4c Update copyright of changed file
See gh-23571
2020-10-02 09:48:18 +02:00
mnhock fc89051242 Use platform-independent line separator
See gh-23571
2020-10-02 09:47:44 +02:00
Stephane Nicoll 797c12e75d Merge branch '2.3.x'
Closes gh-23573
2020-10-02 09:34:49 +02:00
Thorasine 6c3dfac1d0 Fix typos
See gh-23561
2020-10-02 09:32:26 +02:00
Madhura Bhave 351929a616 Merge branch '2.3.x'
Closes gh-23570
2020-10-01 18:20:09 -07:00
Madhura Bhave e2289e2f21 Merge branch '2.2.x' into 2.3.x
Closes gh-23569
2020-10-01 18:19:35 -07:00
Madhura Bhave c0f158dffd Polish "Do not fail if h2Console bean cannot connect to db"
See gh-23566
2020-10-01 18:16:11 -07:00
Shraddha Yeole 2d76de29ff Do not fail if h2Console bean cannot connect to db
See gh-23566
2020-10-01 18:10:48 -07:00
Madhura Bhave 9a6d52e30d Merge branch '2.2.x' into 2.3.x 2020-10-01 18:01:53 -07:00
Madhura Bhave 3118ca9313 Polish 2020-10-01 18:01:11 -07:00
Madhura Bhave ae7de284f4 Merge branch '2.3.x'
Closes gh-23568
2020-10-01 17:20:33 -07:00
Madhura Bhave 121ba2b0ab Merge branch '2.2.x' into 2.3.x
Closes gh-23567
2020-10-01 17:16:37 -07:00
ketaki-t 66aa24b5f0 Remove documentation for unsupported gradle versions
See gh-23562
2020-10-01 17:13:26 -07:00
Madhura Bhave 7c22e71753 Polish "Deprecate EmbeddedDatabaseConnection#HSQL"
See gh-23565
2020-10-01 16:56:48 -07:00
desainidhi99 d5a1421bbe Deprecate EmbeddedDatabaseConnection#HSQL in favor of HSQLDB
See gh-23565
2020-10-01 16:55:44 -07:00
Andy Wilkinson 65c7cd43db Merge branch '2.3.x'
Closes gh-23557
2020-10-01 12:38:44 +01:00
Andy Wilkinson 914dccade2 Merge branch '2.2.x' into 2.3.x
Closes gh-23555
2020-10-01 12:30:16 +01:00
Andy Wilkinson 323af718e2 Only change the method of requests that Jetty won't handle by default
Previously, JettyEmbeddedErrorHandler would change the method of every
request that is handles to GET. This was being done to work around
Jetty's error handling only dealing with GET, POST, and HEAD requests
by default. It had the unwanted side-effect of causing an error
response to a HEAD request having a body as, from the error handling's
perspective, it was a GET request.

This commit updates JettyEmbeddedErrorHandler to only set the method
on a request for which error handling is being performed if the method
isn't already one that will be handled, leaving the method of GET,
POST, and HEAD requests unchanged.

Unfortunately, short of implementing an HTTP client, this change cannot
be tested as the Apache HttpClient, OkHttp, and the JDK's
HttpURLConnection all silently drop the body of a response to a HEAD
request, preventing a test from asserting that a body hasn't been sent.

Closes gh-23551
2020-10-01 12:29:44 +01:00
Andy Wilkinson 9e3a2bbdeb Implement BeanFactoryAware to inject BeanFactory
Closes gh-23543
2020-09-30 19:38:06 +01:00
Stephane Nicoll 9ff946bafa Remove unnecessary stubbing 2020-09-30 16:13:43 +02:00
Stephane Nicoll de32fab324 Adapt to API change in Spring Framework 5.3.0 snapshots
See gh-23534
2020-09-30 16:09:41 +02:00
Andy Wilkinson f4ce77fcae Merge branch '2.3.x'
Closes gh-23541
2020-09-30 14:58:26 +01:00
Andy Wilkinson e58a92b3d0 Introduce a dedicated @GradleCompatibility annotation
Rather than using the extension directly, introduced a dedicated
annotation will enable customization of the compatibility tests that
are run via attributes on the annotation. For example, it will allow
certain test classes to run their tests with Gradle's configuration
cache enabled while others disable it.

Closes gh-23532
2020-09-30 14:50:48 +01:00
Andy Wilkinson bd4934b0fd Fix matching of SNAPSHOT artifacts when customizing layers
Previously the artifact's version was used. In an artifact's version,
SNAPSHOT is replaced with the timestamped version number of a specific
snapshot. As a result, it no longer matches the *:*:*SNAPSHOT pattern.

This commit replaces switches to using the artifact's base version.
This preserves the SNAPSHOT in the version number. For non-snapshot
artifacts, the version and base version are identical.

Fixes gh-23533
2020-09-30 14:48:04 +01:00
Stephane Nicoll 366fec33d0 Adapt to API change in Spring Framework 5.3.0 snapshots
See gh-23534
2020-09-30 13:46:57 +02:00
Stephane Nicoll 6254ad634e Merge branch '2.3.x'
Closes gh-23535
2020-09-30 10:32:16 +02:00
Stephane Nicoll 2f6c19d618 Start building against Spring Framework 5.3.0 snapshots
See gh-23534
2020-09-30 10:31:29 +02:00
Stephane Nicoll cd15cbdc79 Do not execute datasource initialization in a separate thread
This commit makes sure that `data.sql` is performed in the same thread
as the one initializing the JPA container.

Closes gh-22852
2020-09-30 10:10:16 +02:00
Stephane Nicoll 789fafadac Start building against Spring Framework 5.3.10 snapshots
See gh-23526
2020-09-30 10:00:21 +02:00
Andy Wilkinson f5df6e463a Reduce configuration resolution when building a layered jar
Previously, BootJar would resolves all of a project's configurations
when building a layered jar. This was unnecessarily broad as it was
likely to include configurations that had contributed nothing to the
jar's classpath.

This commit replaces the configuration resolution with an afterResolve
action that populates the ResolvedDependencies in response to a
configuration being resolved. This allows the resolved dependencies to
be populated from all of the configurations that were resolved as part
of determining the jars classpath and no more.

Closes gh-23528
2020-09-29 17:51:55 +01:00
Stephane Nicoll 75554ce236 Polish "Add support for Oracle UCP"
See gh-23403
2020-09-29 16:09:55 +02:00
Fabio Grassi a21ab392b6 Add support for Oracle UCP
See gh-23403
2020-09-29 14:45:48 +02:00
Andy Wilkinson a19a565410 Stop registering the default servlet by default
Previously, the default servlet was registered automatically when using
embedded Jetty, Tomcat, or Undertow. However, it is not used by the
majority of applications where Spring MVC's DispatcherServlet will be
the only servlet that's needed. As such configuring the default servlet
was wasting CPU and memory.

This commit changes the default for registering the default servlet to
false. It can be re-enabled by setting
server.servlet.register-default-servlet=true.

Closes gh-22915
2020-09-29 11:52:19 +01:00
Stephane Nicoll 2852ea0808 Remove useless version override for MongoDBContainer
Closes gh-23520
2020-09-29 10:50:30 +02:00
Stephane Nicoll 137f4ec980 Merge branch '2.3.x'
Closes gh-23522
2020-09-29 10:46:36 +02:00
Stephane Nicoll 466c1012d6 Merge branch '2.2.x' into 2.3.x
Closes gh-23521
2020-09-29 10:44:30 +02:00
Stephane Nicoll fd3683646a Migrate SessionAutoConfigurationMongoTests to Testcontainers
Closes gh-23512
2020-09-29 10:34:59 +02:00
Stephane Nicoll cc1f7402a7 Associate ResourceLoader with RabbitConnectionFactoryBean
Closes gh-22332
2020-09-29 10:14:34 +02:00
Stephane Nicoll 36382e599c Add support for Redis 6 authentication with username
Closes gh-22702
2020-09-29 10:01:11 +02:00
Stephane Nicoll a5c20a5132 Polish 2020-09-28 14:56:44 +02:00
Lukas Cardot e95bcfac34 Configure the bootBuildInfo task lazily
Prior to this commit, the bootBuildInfo was configured eagerly.
Configuring it lazily prevent this task from being configured when not
explicitly needed. Also, the 'classes' and 'bootJar' tasks are now
lazily configured, as the bootBuildInfo task was causing them to be
configured eagerly.

See gh-23435
2020-09-28 11:19:26 +01:00
Andy Wilkinson ad6de10f14 Remove use of deprecated SDR API when describing request mappings
Closes gh-22654
2020-09-28 11:08:24 +01:00
Stephane Nicoll 57bc23284e Apply DataSource aliases only when necessary
This commit makes sure that aliases are only applied when they match
the DataSource being bound. This prevent an alias targetted to a
DataSource to accidently match an unexpected property of another
DataSource.

Closes gh-23480
2020-09-28 10:17:13 +02:00
Stephane Nicoll d9b4d7b594 Merge branch '2.3.x'
Closes gh-23509
2020-09-28 09:22:19 +02:00
Stephane Nicoll 2c1634e6ed Merge branch '2.2.x' into 2.3.x
Closes gh-23508
2020-09-28 09:21:51 +02:00
Rujun Chen 8330752b11 Add mising entry for Netty tcnative dependency management
See gh-23502
2020-09-28 09:18:44 +02:00
Stephane Nicoll 77e27eaeb1 Polish "Add reference to desensitization spring boot starter"
See gh-23507
2020-09-28 09:14:23 +02:00
zyc 1d0b085b5c Add reference to desensitization spring boot starter
See gh-23507
2020-09-28 09:14:09 +02:00
Andy Wilkinson 558c2b4591 Merge branch '2.3.x'
Closes gh-23501
2020-09-26 09:17:08 +01:00
Andy Wilkinson 9bd040cb0f Merge branch '2.2.x' into 2.3.x
Closes gh-23500
2020-09-26 09:16:46 +01:00
Andy Wilkinson e74f777971 Remove use of spring-core's Assert from PropertiesLauncher
Fixes gh-23474
2020-09-26 09:11:05 +01:00
Andy Wilkinson ab8d33aa72 Merge branch '2.3.x'
Closes gh-23482
2020-09-24 19:04:33 +01:00
Andy Wilkinson df5cd21ca5 Merge branch '2.2.x' into 2.3.x
Closes gh-23481
2020-09-24 19:04:17 +01:00
Andy Wilkinson 6dc8e6815d Align default tldScanPatterns with Tomcat's
Previously, we configured embedded Tomcat in such a way that no TLD
scan patterns were configured. This differed from a standalone
Tomcat installation where 4 patterns are configured that take
precedence over some of the skip patterns. The missing scan patterns
resulted in the skip patterns preventing the discovery of Log4j2's
TLDs.

This commit updates TomcatServletWebServerFactory to configure the
same four scan patterns as standalone Tomcat configures by default.

Fixes gh-23302
2020-09-24 17:51:38 +01:00
Andy Wilkinson b662f1e06e Remove UnresolvedDependenciesAnalyzer from the Gradle plugin
Closes gh-23479
2020-09-24 15:16:29 +01:00
Stephane Nicoll 4d33062d30 Upgrade to Hazelcast Hibernate5 2.1.1
Closes gh-23476
2020-09-24 15:57:07 +02:00
Stephane Nicoll 4009acf025 Add support for Hazelcast
This commit upgrades to Hazelcast 4.0.3, yet keeping compatibility with
Hazelcast 3.x.

Closes gh-20856
Closes gh-23475
2020-09-24 15:57:07 +02:00
Andy Wilkinson 7b183ef99d Merge branch '2.3.x'
Closes gh-23478
2020-09-24 14:46:42 +01:00
Andy Wilkinson e626f7f47e Merge branch '2.2.x' into 2.3.x
Closes gh-23477
2020-09-24 14:45:55 +01:00
Andy Wilkinson bf9d23e55a Consider SpringBootTest's web environment in context cache key
Previously, the web environment configured on `@SpringBootTest` was not
part of the context cache key. As a result, two test classes that has
identical configuration other than one using a MOCK web environment and
the other using a DEFINED_PORT web environment would share a context
when they should not do so. Classes that use MOCK and RANDOM_PORT were
not affected as the use of RANDOM_PORT results in a property for the
port being added to the environment.

This commit adds a new ContextCustomizer, SpringBootTestWebEnvironment,
that is used to capture the `webEnvironment` from `@SpringBootTest`
and use it in its hashCode and equals implementations. This fixes the
problem as all context customizers are evaluated when determing the
equality of two context cache keys.

Fixes gh-23085
2020-09-24 14:43:51 +01:00
thorasine 2d74aef6ef Fix typos
See gh-23465
2020-09-24 11:42:05 +02:00
Stephane Nicoll c44e1ec0ad Merge branch '2.3.x'
Closes gh-23462
2020-09-23 14:36:59 +02:00
Stephane Nicoll b3c5588c86 Merge branch '2.2.x' into 2.3.x
Closes gh-23461
2020-09-23 14:36:41 +02:00
Pavel Gordon 62eb835a4e Fix link to Log4j's JDK Logging Adapter in reference documentation
See gh-23459
2020-09-23 14:36:00 +02:00
thorasine 9955dac316 Fix typo
See gh-23456
2020-09-23 14:20:51 +02:00
Stephane Nicoll 4d10fbfd52 Rewrite JobLauncherApplicationRunnerTests
This commit rewrites the test to use an in-memory database rather than
the deprecated Map-based arrangement.

Closes gh-23369
2020-09-23 14:11:01 +02:00
Andy Wilkinson 17d5e17069 Merge branch '2.3.x' 2020-09-22 16:26:58 +01:00
Andy Wilkinson 232c310df2 Merge branch '2.2.x' into 2.3.x 2020-09-22 16:26:39 +01:00
Andy Wilkinson 24102656f2 Fix Log4j2 XML configuration tests on Windows
See gh-22983
2020-09-22 16:03:58 +01:00
Stephane Nicoll 7d984d7f89 Merge branch '2.3.x'
Closes gh-23453
2020-09-22 16:45:32 +02:00
Stephane Nicoll 3adf06df17 Merge branch '2.2.x' into 2.3.x
Closes gh-23452
2020-09-22 16:45:08 +02:00
Stephane Nicoll 2999f09a40 Rework tip on templates location in the IDE
This commit rework the tip on locating templates when running the app
in the IDE. Using classpath* should not change anything as this won't
make a difference without a pattern in the path.

Closes gh-23068
2020-09-22 16:44:16 +02:00
Stephane Nicoll 1258bce57a Add bomr exclusion for Apache Solr 8.6+
Closes gh-23370
2020-09-22 15:42:14 +02:00
Andy Wilkinson 659b459fab Make the auto-configured LocaleContextResolver conditional on missing bean
Closes gh-23419
2020-09-22 14:35:05 +01:00
Stephane Nicoll 531690b8e1 Merge branch '2.2.x' into 2.3.x
Closes gh-23448
2020-09-22 15:21:04 +02:00
Stephane Nicoll 7f84a92ef1 Document that Java 15 is supported
Closes gh-23447
2020-09-22 15:19:47 +02:00
Stephane Nicoll 1631ae23f5 Allow RestTemplateBuilder to be further customized
Closes gh-23389
2020-09-22 14:07:43 +02:00
Stephane Nicoll 37ded9f6d3 Merge branch '2.2.x' into 2.3.x
Closes gh-23446
2020-09-22 10:10:24 +02:00
dreis2211 fba1fb23e4 Fix multi-release JAR test on JDK 15
Backport of 54f93e9

See gh-23445
2020-09-22 10:09:18 +02:00
Andy Wilkinson 6d2deb89dd Polish 2020-09-22 09:05:34 +01:00
Phillip Webb 363d35a0ac Merge branch '2.2.x' into 2.3.x
Closes gh-23444
2020-09-21 23:20:10 -07:00
Phillip Webb b443d22c59 Merge branch '2.1.x' into 2.2.x
Closes gh-23443
2020-09-21 23:19:41 -07:00