Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,172 Commits 23 Branches 0 Tags
d16ecab24b4087c83559bd8144143be94de918bb
Commit Graph

33172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephane Nicoll
2f5145b6a1 Upgrade to Micrometer 1.5.4 
Closes gh-22932
 2020-08-13 13:04:03 +02:00
Andy Wilkinson
46f686a55d Merge branch '2.3.x' 2020-08-13 12:03:25 +01:00
Andy Wilkinson
a087d706d0 Upgrade to Spring Batch 4.3.0-M2 
Closes gh-22892
 2020-08-13 12:03:07 +01:00
Andy Wilkinson
eb6a3eff3d Upgrade to Micrometer 1.5.4 
Closes gh-22934
 2020-08-13 12:02:30 +01:00
Stephane Nicoll
42ca62b2e7 Merge branch '2.3.x' 
Closes gh-22931
 2020-08-13 11:49:03 +02:00
Stephane Nicoll
df78105a3c Merge branch '2.2.x' into 2.3.x 
Closes gh-22930
 2020-08-13 11:48:43 +02:00
Stephane Nicoll
70f1216359 Merge pull request #22919 from smlc 
* pr/22919:
  Polish "Fix conditions that lead to auto-configure PushGateway"
  Fix conditions that lead to auto-configure PushGateway

Closes gh-22919
 2020-08-13 11:48:01 +02:00
Stephane Nicoll
f61a632a37 Polish "Fix conditions that lead to auto-configure PushGateway" 
See gh-22919
 2020-08-13 11:47:43 +02:00
smlc
c355b95f6c Fix conditions that lead to auto-configure PushGateway 
See gh-22919
 2020-08-13 11:41:49 +02:00
Stephane Nicoll
71d2a83bcb Upgrade Java 15 version in CI image 
Closes gh-22920
 2020-08-13 11:32:15 +02:00
Stephane Nicoll
947e484001 Merge branch '2.3.x' 
Closes gh-22928
 2020-08-13 09:44:26 +02:00
Stephane Nicoll
d0662e824a Fix default value of server.jetty.accesslog.format 
Closes gh-22921
 2020-08-13 09:43:37 +02:00
Scott Frederick
7c7079f91a Merge branch '2.3.x' 2020-08-12 17:44:52 -05:00
Scott Frederick
4c6a722f18 Fix test for Java version in image building docs 
See gh-22916
 2020-08-12 17:43:37 -05:00
Scott Frederick
092bbd198e Merge branch '2.3.x' 
Closes gh-22923
 2020-08-12 17:04:54 -05:00
Scott Frederick
005ed8b8db Use Java version wildcard in image building docs 
Fixes gh-22916
 2020-08-12 17:04:17 -05:00
Scott Frederick
8e1768262c Merge pull request #22736 from anshlykov 
* gh-22736:
  Polish "Add pullPolicy option for image building"
  Add pullPolicy option for image building

Closes gh-22736
 2020-08-12 15:56:11 -05:00
Scott Frederick
6b15822cb1 Polish "Add pullPolicy option for image building" 
See gh-22736
 2020-08-12 15:16:38 -05:00
anshlykov
c7449b57ce Add pullPolicy option for image building 
This commit adds a pullPolicy option to the configuration of the Maven
plugin spring-boot:build-image goal and the Gradle plugin bootBuildImage
task. The new option gives users control over pulling the builder image
and run image from a remote image registry to the local Docker daemon.

See gh-22736
 2020-08-12 15:16:38 -05:00