Commit Graph

30902 Commits (d9d051053d3f216cc04a2457a672270040724b3b)
 

Author SHA1 Message Date
Phillip Webb 2b591387b8 Restore tomcat-embed TldPatterns
Restore tomcat-embed-core-* and tomcat-embed-logging-* patterns which
were inadvertently removed in commit 0ec8d281ef.

See gh-25764
4 years ago
Phillip Webb 11a94ee6f0 Merge branch '2.3.x' into 2.4.x 4 years ago
Phillip Webb 82127fdaa3 Update copyright year of changed files 4 years ago
Phillip Webb 56674b9031 Merge branch '2.3.x' into 2.4.x
Closes gh-25770
4 years ago
Phillip Webb 0ec8d281ef Align TldPatterns with Tomcat default
Update `TldPatterns` to align with the latest default shipped by Tomcat.
This commit also introduces a test to ensure that we will remain aligned
going forwards.

Closes gh-25764
4 years ago
Andy Wilkinson 96ba9ae47f Merge branch '2.3.x' into 2.4.x
Closes gh-25768
4 years ago
Andy Wilkinson 62023104de Test auto-configured MockRestServiceServer with metrics and a root URI
Closes gh-25741
4 years ago
Andy Wilkinson 33cf8b3bc4 Merge branch '2.3.x' into 2.4.x
Closes gh-25765
4 years ago
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
4 years ago
Andy Wilkinson 5ff7d3bc02 Merge branch '2.3.x' into 2.4.x
Closes gh-25761
4 years ago
Andy Wilkinson f8c1a73bf2 Prevent import of Micrometer class outside of the Actuator
Closes gh-25760
4 years ago
Stephane Nicoll 2ecae2df77 Merge branch '2.3.x' into 2.4.x
Closes gh-25754
4 years ago
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
4 years ago
Stephane Nicoll c2f452a87a Polish "Take JPA database action into account when setting ddlAuto"
See gh-25129
4 years ago
bono007 674b01cb06 Take JPA database action into account when setting ddlAuto
See gh-25129
4 years ago
Scott Frederick 6f860b441b Merge branch '2.3.x' into 2.4.x
Closes gh-25700
4 years ago
Spring Buildmaster adb82c1d4e Next development version (v2.4.5-SNAPSHOT) 4 years ago
Stephane Nicoll 072c858d0e Upgrade to Spring Batch 4.3.2
Closes gh-25579
4 years ago
Stephane Nicoll 8e35d6a5fc Upgrade to Spring Integration 5.4.5
Closes gh-25646
4 years ago
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
4 years ago
Andy Wilkinson 0d7a60f8cf Upgrade to Spring AMQP 2.3.6
Closes gh-25647
4 years ago
Andy Wilkinson 5005bd3ded Upgrade to Spring Kafka 2.6.7
Closes gh-25578
4 years ago
Andy Wilkinson 2c2e2c8448 Merge branch '2.3.x' into 2.4.x
Closes gh-25727
4 years ago
Andy Wilkinson 4358d9bc39 Update CI to use Artifactory Resource 0.0.14
Closes gh-25698
4 years ago
Stephane Nicoll 426fb49951 Merge branch '2.3.x' into 2.4.x 4 years ago
Stephane Nicoll 6f9352bda9 Fix description of management.metrics.export.influx.db
Closes gh-25723
4 years ago
Stephane Nicoll 42994349fe Merge branch '2.3.x' into 2.4.x
Closes gh-25724
4 years ago
Stephane Nicoll 446e838b1b Fix description of management.metrics.export.influx.db
Closes gh-25723
4 years ago
Stephane Nicoll 606c871d4a Upgrade to Spring Data 2020.0.6
Closes gh-25547
4 years ago
Stephane Nicoll 052624ffb2 Upgrade to Lettuce 6.0.3.RELEASE
Closes gh-25720
4 years ago
Stephane Nicoll a8667daf52 Upgrade to Kotlin Coroutines 1.4.3
Closes gh-25719
4 years ago
Andy Wilkinson 758a2ee7ca Don't pass null exception translation result into jOOQ
Closes gh-25717
4 years ago
Andy Wilkinson c815195f13 Polish 4 years ago
Andy Wilkinson 5595fd4017 Merge branch '2.3.x' into 2.4.x
Closes gh-25715
4 years ago
Andy Wilkinson 0e0418546b Test spring-boot:build-image when repackage is also invoked
Closes gh-25714
4 years ago
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
4 years ago
Andy Wilkinson 6ddf525ac0 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson ae2ff7849b Revert "Fail fast when finalName is misconfigured"
This reverts commit 263b7c20e4.

See gh-25590
4 years ago
Stephane Nicoll c0c23ae50c Merge pull request #25709 from dreis2211
* pr/25709:
  Upgrade to Java 16 GA builds in CI

Closes gh-25709
4 years ago
dreis2211 678da84dd9 Upgrade to Java 16 GA builds in CI
See gh-25709
4 years ago
Scott Frederick eaa510872a Merge branch '2.3.x' into 2.4.x
Closes gh-25700
4 years ago
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
4 years ago
Andy Wilkinson 3e69522e2d Merge branch '2.3.x' into 2.4.x
Closes gh-25702
4 years ago
Andy Wilkinson f823bbb9b2 Upgrade to Spring Asciidoctor Extensions 0.5.1
Closes gh-25558
4 years ago
Andy Wilkinson 13dda798c5 Merge branch '2.3.x' into 2.4.x 4 years ago
Andy Wilkinson 2359b37e69 Polish 4 years ago
Andy Wilkinson 4865c23a41 Merge branch '2.3.x' into 2.4.x
Closes gh-25695
4 years ago
Andy Wilkinson bf33e7ef7e Automatically supersede existing upgrade issue when running Bomr
Closes gh-25345
4 years ago
Andy Wilkinson 2560f261cd Merge branch '2.3.x' into 2.4.x
Closes gh-25692
4 years ago
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
4 years ago