Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,747 Commits 20 Branches 316 Tags 253 MiB
96ba9ae47f
Commit Graph

30747 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
96ba9ae47f Merge branch '2.3.x' into 2.4.x 
Closes gh-25768
 2021-03-23 14:48:24 +00:00
Andy Wilkinson
62023104de Test auto-configured MockRestServiceServer with metrics and a root URI 
Closes gh-25741
 2021-03-23 14:37:37 +00:00
Andy Wilkinson
33cf8b3bc4 Merge branch '2.3.x' into 2.4.x 
Closes gh-25765
 2021-03-23 13:06:35 +00:00
Andy Wilkinson
bf6f36a783 Apply any root URI to RestTemplate metric's URI tag 
Previously, a root URI configured via RestTemplateBuilder's rootUri
method and RootUriTemplateHandler was not taken into account when
generated the URI tag for RestTemplate request metrics.

This commit updates MetricsClientHttpRequestInterceptor to be aware
of RootUriTemplateHandler and capture the URI template once the
root URI has been applied.

Fixes gh-25744
 2021-03-23 13:05:54 +00:00
Andy Wilkinson
5ff7d3bc02 Merge branch '2.3.x' into 2.4.x 
Closes gh-25761
 2021-03-23 10:20:29 +00:00
Andy Wilkinson
f8c1a73bf2 Prevent import of Micrometer class outside of the Actuator 
Closes gh-25760
 2021-03-23 10:16:42 +00:00
Stephane Nicoll
2ecae2df77 Merge branch '2.3.x' into 2.4.x 
Closes gh-25754
 2021-03-22 14:44:48 +01:00
Stephane Nicoll
2b29b99984 Merge pull request #25129 from bono007 
* pr/25129:
  Polish "Take JPA database action into account when setting ddlAuto"
  Take JPA database action into account when setting ddlAuto

Closes gh-25129
 2021-03-22 14:44:10 +01:00
Stephane Nicoll
c2f452a87a Polish "Take JPA database action into account when setting ddlAuto" 
See gh-25129
 2021-03-22 14:41:25 +01:00
bono007
674b01cb06 Take JPA database action into account when setting ddlAuto 
See gh-25129
 2021-03-22 13:53:28 +01:00
Scott Frederick
6f860b441b Merge branch '2.3.x' into 2.4.x 
Closes gh-25700
 2021-03-19 14:52:20 -05:00
Spring Buildmaster
adb82c1d4e Next development version (v2.4.5-SNAPSHOT) 2021-03-18 08:55:52 +00:00
Stephane Nicoll
072c858d0e Upgrade to Spring Batch 4.3.2 
Closes gh-25579
 2021-03-18 08:28:36 +01:00
Stephane Nicoll
8e35d6a5fc Upgrade to Spring Integration 5.4.5 
Closes gh-25646
 2021-03-18 07:55:06 +01:00
Scott Frederick
e4fa39df01 Fail fast when finalName is misconfigured 
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
 2021-03-17 15:19:21 -05:00
Andy Wilkinson
0d7a60f8cf Upgrade to Spring AMQP 2.3.6 
Closes gh-25647
 2021-03-17 18:27:16 +00:00
Andy Wilkinson
5005bd3ded Upgrade to Spring Kafka 2.6.7 
Closes gh-25578
 2021-03-17 18:26:44 +00:00
Andy Wilkinson
2c2e2c8448 Merge branch '2.3.x' into 2.4.x 
Closes gh-25727
 2021-03-17 17:38:17 +00:00
Andy Wilkinson
4358d9bc39 Update CI to use Artifactory Resource 0.0.14 
Closes gh-25698
 2021-03-17 17:37:09 +00:00
Stephane Nicoll
426fb49951 Merge branch '2.3.x' into 2.4.x 2021-03-17 16:02:53 +01:00
Stephane Nicoll
6f9352bda9 Fix description of management.metrics.export.influx.db 
Closes gh-25723
 2021-03-17 15:09:37 +01:00
Stephane Nicoll
42994349fe Merge branch '2.3.x' into 2.4.x 
Closes gh-25724
 2021-03-17 15:08:32 +01:00
Stephane Nicoll
446e838b1b Fix description of management.metrics.export.influx.db 
Closes gh-25723
 2021-03-17 15:07:02 +01:00
Stephane Nicoll
606c871d4a Upgrade to Spring Data 2020.0.6 
Closes gh-25547
 2021-03-17 14:27:48 +01:00
Stephane Nicoll
052624ffb2 Upgrade to Lettuce 6.0.3.RELEASE 
Closes gh-25720
 2021-03-17 14:25:38 +01:00
Stephane Nicoll
a8667daf52 Upgrade to Kotlin Coroutines 1.4.3 
Closes gh-25719
 2021-03-17 14:25:36 +01:00
Andy Wilkinson
758a2ee7ca Don't pass null exception translation result into jOOQ 
Closes gh-25717
 2021-03-17 12:25:50 +00:00
Andy Wilkinson
c815195f13 Polish 2021-03-17 12:25:13 +00:00
Andy Wilkinson
5595fd4017 Merge branch '2.3.x' into 2.4.x 
Closes gh-25715
 2021-03-17 11:31:46 +00:00
Andy Wilkinson
0e0418546b Test spring-boot:build-image when repackage is also invoked 
Closes gh-25714
 2021-03-17 11:19:29 +00:00
Andy Wilkinson
ed4e419b0c Revert "Merge branch '2.3.x' into 2.4.x" 
This reverts commit eaa510872a, reversing
changes made to 3e69522e2d.

See gh-25700
 2021-03-17 11:13:58 +00:00
Andy Wilkinson
6ddf525ac0 Merge branch '2.3.x' into 2.4.x 2021-03-17 11:12:36 +00:00
Andy Wilkinson
ae2ff7849b Revert "Fail fast when finalName is misconfigured" 
This reverts commit 263b7c20e4.

See gh-25590
 2021-03-17 11:11:24 +00:00
Stephane Nicoll
c0c23ae50c Merge pull request #25709 from dreis2211 
* pr/25709:
  Upgrade to Java 16 GA builds in CI

Closes gh-25709
 2021-03-17 08:44:07 +01:00
dreis2211
678da84dd9 Upgrade to Java 16 GA builds in CI 
See gh-25709
 2021-03-17 08:43:55 +01:00
Scott Frederick
eaa510872a Merge branch '2.3.x' into 2.4.x 
Closes gh-25700
 2021-03-16 17:31:32 -05:00
Scott Frederick
263b7c20e4 Fail fast when finalName is misconfigured 
When the `finalName` parameter is incorrectly set in the Spring Boot
Maven plugin configuration instead of in the `build` configuration, the
repackaged and original archive files are not named as expected. Prior
to this commit, the image building goal would detect this error
condition and throw an exception late in the process of creating the
build container, leaving the container in an unstable state. This
commit changes the image building goal to detect this condition early,
before attempting to create the container.

Fixes gh-25590
 2021-03-16 17:22:48 -05:00
Andy Wilkinson
3e69522e2d Merge branch '2.3.x' into 2.4.x 
Closes gh-25702
 2021-03-16 20:25:25 +00:00
Andy Wilkinson
f823bbb9b2 Upgrade to Spring Asciidoctor Extensions 0.5.1 
Closes gh-25558
 2021-03-16 20:24:45 +00:00
Andy Wilkinson
13dda798c5 Merge branch '2.3.x' into 2.4.x 2021-03-16 19:43:45 +00:00
Andy Wilkinson
2359b37e69 Polish 2021-03-16 19:43:35 +00:00
Andy Wilkinson
4865c23a41 Merge branch '2.3.x' into 2.4.x 
Closes gh-25695
 2021-03-16 19:24:15 +00:00
Andy Wilkinson
bf33e7ef7e Automatically supersede existing upgrade issue when running Bomr 
Closes gh-25345
 2021-03-16 19:09:38 +00:00
Andy Wilkinson
2560f261cd Merge branch '2.3.x' into 2.4.x 
Closes gh-25692
 2021-03-16 16:35:31 +00:00
Andy Wilkinson
017dbe608f Merge pull request #25620 from uc4w6c 
* gh-25620:
  Polish "Improve error message when no resources exist at a script location"
  Improve error message when no resources exist at a script location

Closes gh-25620
 2021-03-16 16:34:28 +00:00
Andy Wilkinson
a832cc9ccd Polish "Improve error message when no resources exist at a script location" 
See gh-25620
 2021-03-16 16:20:11 +00:00
Yuta Saito
42841b895f Improve error message when no resources exist at a script location 
See gh-25620
 2021-03-16 16:19:27 +00:00
Andy Wilkinson
3e876ac83e Merge branch '2.3.x' into 2.4.x 2021-03-16 16:14:41 +00:00
Andy Wilkinson
226ee61dea Create exception reporters when needed so they pick up current state 
Fixes gh-25691
 2021-03-16 16:13:40 +00:00
Andy Wilkinson
f9db1968bf Upgrade to Micrometer 1.6.5 
Closes gh-25543
 2021-03-16 10:53:15 +00:00