Commit Graph

26218 Commits

Author SHA1 Message Date
Stephane Nicoll
06ce3e0d4d Polish "Add instruction to format code in buildSrc"
See gh-20806
2020-04-25 09:38:51 +02:00
Mike Smithson
942e3dd132 Add instruction to format code in buildSrc
See gh-20806
2020-04-25 09:38:43 +02:00
Stephane Nicoll
85a3fcfb5e Merge branch '2.2.x'
Closes gh-21119
2020-04-25 09:32:24 +02:00
Stephane Nicoll
5ed27ddaef Merge pull request #21077 from nikmanzotti
* pr/21077:
  Polish "Enhance Database initialization how to guide"
  Enhance Database initialization how to guide

Closes gh-21077
2020-04-25 09:31:51 +02:00
Stephane Nicoll
80410997ec Polish "Enhance Database initialization how to guide"
See gh-21077
2020-04-25 09:30:58 +02:00
nikmanzotti
f2b10be01e Enhance Database initialization how to guide
See gh-21077
2020-04-25 09:30:43 +02:00
Stephane Nicoll
961be0fea3 Merge branch '2.2.x'
Closes gh-21118
2020-04-25 09:15:49 +02:00
Stephane Nicoll
092c321700 Merge pull request #21002 from dreis2211
* pr/21002:
  Fix typo

Closes gh-21002
2020-04-25 09:14:17 +02:00
dreis2211
e3a9bacf3b Fix typo
See gh-21002
2020-04-25 09:14:01 +02:00
Stephane Nicoll
83131629ca Merge pull request #21117 from dreis2211
* pr/21117:
  Remove unused method

Closes gh-21117
2020-04-25 09:07:42 +02:00
dreis2211
54f319acd5 Remove unused method
See gh-21117
2020-04-25 09:07:13 +02:00
Stephane Nicoll
ff31733063 Merge pull request #21110 from izeye
* pr/21110:
  Polish

Closes gh-21110
2020-04-25 09:04:58 +02:00
Johnny Lim
ef567388c1 Polish
See gh-21110
2020-04-25 09:04:10 +02:00
Stephane Nicoll
5077943b18 Merge pull request #21103 from dreis2211
* pr/21103:
  Avoid recompiling pattern in Handler#canonicalize

Closes gh-21103
2020-04-25 09:03:50 +02:00
dreis2211
848127ae49 Avoid recompiling pattern in Handler#canonicalize
See gh-21103
2020-04-25 09:02:21 +02:00
Stephane Nicoll
3f96e2165a Merge pull request #21079 from dreis2211
* pr/21079:
  Fix link to R2DBC Query in docs

Closes gh-21079
2020-04-25 09:01:14 +02:00
dreis2211
c2fb95151b Fix link to R2DBC Query in docs
See gh-21079
2020-04-25 09:00:58 +02:00
Stephane Nicoll
6d17c9f151 Merge pull request #21054 from dreis2211
* pr/21054:
  Fix Actuator API PDF name

Closes gh-21054
2020-04-25 08:59:27 +02:00
dreis2211
667033c149 Fix Actuator API PDF name
See gh-21054
2020-04-25 08:59:00 +02:00
Stephane Nicoll
3907fb9e02 Merge pull request #21009 from dreis2211
* pr/21009:
  Update copyright year of changed file
  Polish

Closes gh-21009
2020-04-25 08:56:57 +02:00
Stephane Nicoll
c7baf5fda1 Update copyright year of changed file
See gh-21009
2020-04-25 08:55:27 +02:00
dreis2211
5eb5bf0a2d Polish
See gh-21009
2020-04-25 08:54:47 +02:00
Stephane Nicoll
5b1b7bcb9b Merge pull request #21007 from izeye
* pr/21007:
  Update copyright year of changed files
  Remove this keyword on member method invocations

Closes gh-21007
2020-04-25 08:54:32 +02:00
Stephane Nicoll
85e9f713b0 Update copyright year of changed files
See gh-21007
2020-04-25 08:50:51 +02:00
Johnny Lim
29717423a3 Remove this keyword on member method invocations
See gh-21007
2020-04-25 08:49:44 +02:00
Stephane Nicoll
f0d4192df9 Merge pull request #20992 from mikaelparsekyan
* pr/20992:
  Polish ApplicationHome

Closes gh-20992
2020-04-25 08:48:35 +02:00
Mikael
c06edbe6f4 Polish ApplicationHome
See gh-20992
2020-04-25 08:44:37 +02:00
Andy Wilkinson
076a384c9c Merge branch '2.2.x'
Closes gh-21112
2020-04-24 18:10:00 +01:00
Andy Wilkinson
29dc236bb2 Broaden deprecation warning check in Gradle Plugin's tests
Closes gh-21111
2020-04-24 17:45:42 +01:00
Andy Wilkinson
d5b944140a Attempt to stabilise CouchbaseAutoConfigurationIntegrationTests
Starting the CouchbaseContainer fails intermittently when creation
of the primary index for the bucket fails with a read timeout. The
test doesn't require a primary index for the bucket so this commit
disables it creation in the hope that it will help to stabilise the
test.
2020-04-24 16:21:08 +01:00
Andy Wilkinson
dc75ca3942 Avoid capturing TCCL when creating DefaultResourceLoaders
Previously, DefaultResourceLoader instances were created using the
default constructor. This causes the resource loader to capture the
TCCL that was in place at that time. This can lead to a class loader
leak if the resource loader is referenced directly or indirectly from
a static field of a class loaded by a different class loader.

This commit updates the creation of DefaultResourceLoader instances
in main code so that the resource load will use the class loader of
the creating class. In almost all cases this will be the same class
loader as was the thread context class loader that was being captured
so the change in behavior is minimal. Crucially, it will still address
the situation where the TCCL was different.

Note the DevTools' ApplicationContextResourceLoader has been updated
to explicitly use the TCCL. This ensures that it uses the restart
class loader which is required for DevTools to function correctly.

Fixes gh-20900
2020-04-24 13:29:29 +01:00
Andy Wilkinson
d53be18582 Deprecate support for Bitronix
Closes gh-20823
2020-04-24 11:37:44 +01:00
Phillip Webb
6ccba24494 Merge branch '2.2.x'
Close gh-20507 in 2.3.0.RC1
2020-04-23 16:40:49 -07:00
Phillip Webb
581ce09f88 Merge branch '2.1.x' into 2.2.x
Closes gh-21106
2020-04-23 16:39:38 -07:00
Phillip Webb
416cfc2c86 Improve @Value documentation
Improve "@ConfigurationProperties vs. @Value" documentation with the
recommendation that kebab-case is used with the `@Value` annotation.

Closes gh-20507
2020-04-23 16:39:22 -07:00
Phillip Webb
96baf2713c Merge branch '2.2.x' 2020-04-23 16:35:36 -07:00
Phillip Webb
db28c0c65c Backport "Attempt to fix CI" 2020-04-23 16:35:01 -07:00
Phillip Webb
4de69c380d Attempt to fix CI 2020-04-23 15:55:10 -07:00
Phillip Webb
c2a21f00ee Merge pull request #21104 from dreis2211
* pr/21104:
  Fix PropertiesMigrationListenerTests

Closes gh-21104
2020-04-23 14:57:42 -07:00
dreis2211
1be8312886 Fix PropertiesMigrationListenerTests
See gh-21104
2020-04-23 14:53:03 -07:00
Phillip Webb
49345025ac Merge branch '2.2.x'
Closes gh-21105
2020-04-23 14:44:08 -07:00
Phillip Webb
93f7e2b6ba Limit when PortInUseException is thrown
Refactor `PortInUseException` logic to a single place and refine when
the exception is thrown.

Prior to this commit, we assumed that a `BindException` was only thrown
when the port was in use. In fact, it's possible that the exception
could be thrown because the requested address "could not be assigned".

We now only throw a `PortInUserException` if the `BindException` message
includes the phrase "in use".

Fixes gh-21101
2020-04-23 14:42:30 -07:00
Phillip Webb
b73d5038d5 Merge branch '2.2.x' 2020-04-23 14:35:08 -07:00
Phillip Webb
9bb53a4c37 Polish 2020-04-23 14:31:49 -07:00
Scott Frederick
8f5ef951de Use current timestamp for index files with Gradle
This commit removes changes the timestamp used when writing the
classpath and layers index files in the Gradle plugin to be the
current timestamp unless `preserveFileTimestamps=true`. It also
polishes some duplication in the handling of entry attributes
when creating the fat archive and adds a test to verify that
the Gradle plugin uses the same fixed timestamp constant as
Gradle uses internally.

See gh-21005
2020-04-23 16:05:32 -05:00
Madhura Bhave
b3ccefdb57 Merge branch '2.2.x'
Closes gh-21102
2020-04-23 10:19:10 -07:00
Madhura Bhave
4dc9bbe127 @SpringBootTest classes with different args shouldn't share a context
Fixes gh-20866
2020-04-23 10:18:14 -07:00
Stephane Nicoll
ddcd1bc7bb Remove metadata for configuration keys that were removed in 2.0
Closes gh-19706
2020-04-23 16:14:13 +02:00
Stephane Nicoll
623fbcbf8c Polish 2020-04-23 15:20:47 +02:00
Stephane Nicoll
1019dbbc47 Merge branch '2.2.x'
Closes gh-21100
2020-04-23 15:00:22 +02:00