root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
28,291 Commits 24 Branches 353 Tags 292 MiB
Commit Graph

28291 Commits

Author SHA1 Message Date
Stephane Nicoll 0b28236e55 Rename neo4j.version to neo4j-java-driver.version 
Closes gh-22952
 2020-08-18 11:00:11 +02:00
Phillip Webb 9460d74e8a Rename CompositeMeterRegistryAutoConfiguration 
Rename `CompositeMeterRegistryAutoConfiguration` to
`MeterRegistryAutoConfiguration` since it can also create non-composite
registries.

Closes gh-22988
 2020-08-17 16:41:10 -07:00
Phillip Webb 12bae2ad52 Merge branch '2.3.x' 
Closes gh-22990
 2020-08-17 16:18:23 -07:00
Phillip Webb ff36f8bab8 Merge branch '2.2.x' into 2.3.x 
Closes gh-22989
 2020-08-17 16:17:47 -07:00
Phillip Webb 460fb3ccb8 Merge pull request #21134 from bendiscz 
* pr/21134:
  Polish 'Order metrics auto-configurations correctly'
  Order metrics auto-configurations correctly

Closes gh-21134
 2020-08-17 16:11:09 -07:00
Phillip Webb 10da595302 Polish 'Order metrics auto-configurations correctly' 
See gh-21134
 2020-08-17 16:10:18 -07:00
Martin Benda 02b7ec787e Order metrics auto-configurations correctly 
Update metrics auto-configurations so that they are auto-configured
after `CompositeMeterRegistryAutoConfiguration` in order to ensure
the `MeterRegistry` bean has been defined.

Prior to this commit, metrics auto-configurations that depended on a
`MeterRegistry` has `@AutoConfigureAfter(MetricsAutoConfiguration.class)`
which is not sufficient since `MetricsAutoConfiguration` does not export
a `MeterRegistry`.

See gh-21134
 2020-08-17 16:03:27 -07:00
Scott Frederick b7fdf8fe87 Preserve user-provided values in MongoClientSettings 
Prior to this commit, values from MongoProperties would always
overwrite matching fields in MongoClientSettings. This commit
preserves all values in MongoClientSettings if the client app
provides the MongoClientSettings bean, and only overwrites from
MongoProperties if no MongoClientSettings bean is provided.

Fixes gh-22321
 2020-08-17 16:07:40 -05:00
Phillip Webb 9c6f0d8f7e Merge branch '2.3.x' 
Closes gh-22984
 2020-08-17 12:40:18 -07:00
Phillip Webb b8a8b85a58 Merge pull request #22750 from Lopfest 
* pr/22750:
  Polish "Fix include exception handling in DefaultErrorAttributes"
  Fix include exception handling in DefaultErrorAttributes

Closes gh-22750
 2020-08-17 12:34:20 -07:00
Scott Frederick c2ec46c5b1 Polish "Fix include exception handling in DefaultErrorAttributes" 
See gh-22750
 2020-08-17 13:33:59 -05:00
Lopfest c49605cd7b Fix include exception handling in DefaultErrorAttributes 
This commit fixes a problem with the handling of the includeException
field in DefaultErrorAttributes.

See gh-22750
 2020-08-17 13:33:59 -05:00
Stephane Nicoll f8265e3e44 Merge branch '2.3.x' 
Closes gh-22980
 2020-08-17 14:20:50 +02:00
Stephane Nicoll d452bbbea8 Merge pull request #22918 from jnizet 
* pr/22918:
  Fix custom image name example and documentation

Closes gh-22918
 2020-08-17 14:20:27 +02:00
Jean-Baptiste Nizet 27528fdd07 Fix custom image name example and documentation 
There is no `artifactId` property in a gradle Project, and the default
value uses the project name.

See gh-22918
 2020-08-17 13:59:42 +02:00
Stephane Nicoll b1e631e8a6 Remove trailing whitespaces 2020-08-17 13:59:08 +02:00
Stephane Nicoll 5985c58d3d Merge pull request #22973 from anshlykov 
* pr/22973:
  Polish "Consider RecordFilterStrategy in Kafka auto-configuration"
  Consider RecordFilterStrategy in Kafka auto-configuration

Closes gh-22973
 2020-08-17 13:54:29 +02:00
Stephane Nicoll 8c0318edc7 Polish "Consider RecordFilterStrategy in Kafka auto-configuration" 
See gh-22973
 2020-08-17 13:54:20 +02:00
anshlykov f68dfde35e Consider RecordFilterStrategy in Kafka auto-configuration 
See gh-22973
 2020-08-17 13:37:00 +02:00
Stephane Nicoll 943a6d2a2b Merge pull request #22945 from dreis2211 
* pr/22945:
  Fix typos in docs

Closes gh-22945
 2020-08-17 13:27:59 +02:00
dreis2211 61838eede1 Fix typos in docs 
See gh-22945
 2020-08-17 13:27:46 +02:00
Stephane Nicoll 80e9bfb9a6 Merge branch '2.3.x' 2020-08-17 13:26:58 +02:00
Stephane Nicoll 6b679b7d64 Polish 
See gh-22945
 2020-08-17 13:24:51 +02:00
Phillip Webb 4df618a2b1 Merge branch '2.3.x' 
Closes gh-22967
 2020-08-14 17:12:53 -07:00
Phillip Webb f75e988450 Merge branch '2.2.x' into 2.3.x 
Closes gh-22966
 2020-08-14 17:12:41 -07:00
Phillip Webb 3271542d98 Add @Interited to @TypeExcludeFilters 
Update `@TypeExcludeFilters` so that it is also annotated with
`@Inherited`.

Closes gh-22939
 2020-08-14 17:12:31 -07:00
Phillip Webb 7a85373fea Merge branch '2.3.x' 
Closes gh-22965
 2020-08-14 17:09:13 -07:00
Phillip Webb 1675b47637 Merge branch '2.2.x' into 2.3.x 
Closes gh-22964
 2020-08-14 17:08:48 -07:00
Phillip Webb 89a6f83344 Fix and improve SpringApplicationBuilder javadoc 
Update SpringApplicationBuilder.properties method javadoc to fix
inaccuracies and apply more consistency.

Closes gh-22962
 2020-08-14 17:06:39 -07:00
Phillip Webb 3e939cbabd Polish method order 2020-08-14 17:02:13 -07:00
Phillip Webb 5591a6ab77 Merge branch '2.3.x' 
Closes gh-22961
 2020-08-14 15:11:47 -07:00
Phillip Webb 03d4b89c06 Merge branch '2.2.x' into 2.3.x 
Closes gh-22960
 2020-08-14 15:11:23 -07:00
Phillip Webb 2fe446335a Merge pull request #22948 from maciejwalkowiak 
* pr/22948:
  Fix typo `Assert4J` -> `AssertJ`

Closes gh-22948
 2020-08-14 15:10:58 -07:00
Maciej Walkowiak 15de956566 Fix typo `Assert4J` -> `AssertJ` 
See gh-22948
 2020-08-14 15:09:56 -07:00
Madhura Bhave bbbbe8e4d2 Make security auto-configs back off when SecurityFilterChain present 
Closes gh-22739
 2020-08-14 12:24:25 -07:00
Andy Wilkinson c9b8a05321 Merge branch '2.3.x' 2020-08-14 15:41:20 +01:00
Andy Wilkinson 3e35fd480f Wait longer for server port and improve diagnostics on timeout 
See gh-22909
 2020-08-14 15:34:41 +01:00
Phillip Webb 310ef6e999 Rename volumemount -> configtree 
Closes gh-22941
 2020-08-13 13:28:25 -07:00
Phillip Webb 5579f9d1c4 Polish 2020-08-13 11:53:36 -07:00
Scott Frederick 2a998a4373 Fix DataNeo4jTestReactiveIntegrationTests 
See gh-22940
 2020-08-13 13:45:04 -05:00
Andy Wilkinson b80811b898 Merge branch '2.3.x' 2020-08-13 18:17:23 +01:00
Spring Buildmaster d0cd445aea Next development version (v2.3.4.BUILD-SNAPSHOT) 2020-08-13 16:01:23 +00:00
Stephane Nicoll 045d2f678d Document Spring Data Neo4j 6 support 
Closes gh-22652
 2020-08-13 17:51:39 +02:00
Stephane Nicoll d4ba55f8d6 Do not configure a ReactiveNeo4jTransactionManager 
The current arrangement with Neo4j does not allow us to know for sure
that the user intends to use `@Transactional` for reactive or imperative
operations.

The main reason for that is that the only trigger for the reactive
auto-configuration is the presence of reactor on the classpath given
that the Neo4j driver ships with both styles in the same jar. And
reactor can be on the classpath for a number of reasons that are
unrelated to imperative access (typically `WebClient`).

This commits removes the auto-configuration of the
ReactiveNeo4jAutoConfiguration and makes sure that if the user defines
one, the regular `PlatformTransactionManager` backs off. This is
a temporarily situation until we can provide a better signal that the
user intends to primarily use imperative repositories.

Closes gh-22940
 2020-08-13 16:57:51 +02:00
Andy Wilkinson 4398c71d12 Merge branch '2.3.x' 
Closes gh-22938
 2020-08-13 13:32:27 +01:00
Andy Wilkinson 8c4e6f766c Revert "Merge pull request #21060 from dsyer" 
This reverts commit 6547ea56f9, reversing
changes made to e9e4a34e62.

Fixes gh-22039
 2020-08-13 13:31:45 +01:00
Andy Wilkinson 81ae24e577 Merge branch '2.3.x' 2020-08-13 12:13:09 +01:00
Andy Wilkinson 1c8392e980 Upgrade to Selenium HtmlUnit 2.43.1 
Closes gh-22937
 2020-08-13 12:04:42 +01:00
Andy Wilkinson 7310b7dbcd Upgrade to Micrometer 1.5.4 
Closes gh-22936
 2020-08-13 12:04:40 +01:00
Andy Wilkinson 1c930396b4 Upgrade to Flyway 6.5.4 
Closes gh-22935
 2020-08-13 12:04:39 +01:00