Commit Graph

28648 Commits

Author SHA1 Message Date
Andy Wilkinson
82dc2dffbd Select specific CLI distribution in CLI's integration tests
Previously, CommandLineInvoker would use the first -bin.zip file found
in build/distributions. If this directory contained multiple zips from
building different versions of Spring Boot, this could result in the
tests being run against the wrong version of the CLI.

This commit updates CommandLineInvoker look for a specific zip in
build/distributions, using the version from gradle.properties to
identify it.

Closes gh-25179
2021-02-11 10:20:30 +00:00
Andy Wilkinson
ded71a0fa8 Merge pull request #25178 from rand0m86
* gh-25178:
  Polish "Remove duplicate declaration of jackson-databind"
  Remove duplicate declaration of jackson-databind

Closes gh-25178
2021-02-11 10:08:45 +00:00
Andy Wilkinson
2ba9a8c211 Polish "Remove duplicate declaration of jackson-databind"
See gh-25178
2021-02-11 10:08:34 +00:00
Vitalii Mahas
a2c491ef43 Remove duplicate declaration of jackson-databind
See gh-25178
2021-02-11 10:08:22 +00:00
Andy Wilkinson
b6d2da0f84 Stop integer default values from becoming decimals
Fixes gh-25172
2021-02-10 19:05:38 +00:00
Andy Wilkinson
708cbd7294 Ignore events from other contexts when waiting for DS init to complete
Fixes gh-24966
2021-02-10 15:07:44 +00:00
Stephane Nicoll
1524793a92 Fix use of deprecated Cassandra properties in integration tests
Closes gh-25148
2021-02-10 15:12:20 +01:00
Stephane Nicoll
b2258b8d62 Merge pull request #25130 from bono007
* pr/25130:
  Polish "Validate Cassandra defaults"
  Validate Cassandra defaults

Closes gh-25130
2021-02-10 10:19:20 +01:00
Stephane Nicoll
e5098697cb Polish "Validate Cassandra defaults"
See gh-25130
2021-02-10 10:18:28 +01:00
bono007
f71ab69aeb Validate Cassandra defaults
See gh-25130
2021-02-10 10:15:31 +01:00
Phillip Webb
166d9b12f1 Merge branch '2.2.x' into 2.3.x 2021-02-09 16:47:50 -08:00
Phillip Webb
7ed64f0677 Drop registry mirror from CI
Remove the registry mirror since it causes oci-build-task to fail.

See gh-25135
2021-02-09 16:46:26 -08:00
Phillip Webb
f5f1b4348e Merge branch '2.2.x' into 2.3.x
Closes gh-25159
2021-02-09 16:43:41 -08:00
Phillip Webb
0129e6b52d Upgrade CI to github-pr-resource v0.23.0
Closes gh-25155
2021-02-09 16:43:19 -08:00
Phillip Webb
479f6200da Merge branch '2.2.x' into 2.3.x
Closes gh-25156
2021-02-09 16:39:32 -08:00
Phillip Webb
4b97f819d6 Upgrade CI to artifactory-resource 0.0.13
Closes gh-25154
2021-02-09 16:37:08 -08:00
Stephane Nicoll
700c9ee0d9 Merge pull request #25120 from dreis2211
* pr/25120:
  Upgrade to Gradle Enterprise Gradle Plugin 3.5.2

Closes gh-25120
2021-02-09 15:24:52 +01:00
dreis2211
4bb86d4d8d Upgrade to Gradle Enterprise Gradle Plugin 3.5.2
See gh-25120
2021-02-09 15:24:08 +01:00
Andy Wilkinson
7898b6afb0 Remove duplicate publication from spring-boot-docs
Fixes gh-25132
2021-02-09 14:10:58 +00:00
Stephane Nicoll
4f656d379c Merge pull request #25116 from dreis2211
* pr/25116:
  Fix build deprecation warnings about duplicate jar entries

Closes gh-25116
2021-02-09 15:04:06 +01:00
dreis2211
4937547b8a Fix build deprecation warnings about duplicate jar entries
See gh-25116
2021-02-09 14:45:58 +01:00
Andy Wilkinson
d12bb6f915 Upgrade to Gradle 6.8.2
Closes gh-25117
2021-02-05 13:34:00 +00:00
Andy Wilkinson
67479b6380 Add junit-platform-launcher dependency by convention
Closes gh-25074
2021-02-02 13:03:21 +00:00
Phillip Webb
630d216430 Update copyright year of changed files 2021-02-01 22:10:24 -08:00
Phillip Webb
c404a50a2e Allow test to use snapshot/milestone repo
Update `spring-boot-maven-plugin` `settings.xml` so that milestone and
snapshot dependencies can be resolved.

See gh-23936
2021-02-01 19:45:11 -08:00
Phillip Webb
faaa5e4186 Fix BOM attached sourceSet
See gh-23936
2021-02-01 16:51:53 -08:00
Phillip Webb
40c1748e3c Remove hardcoded versions from MavenBuild
Use the dependencies BOM to ensure versions used in the `MavenBuild`
test class are always aligned.

Closes gh-23936
2021-02-01 16:20:55 -08:00
Phillip Webb
939b5dfc26 Add junit-platform-launcher dependency
Update `build.gradle` files to ensure that `junit-platform-launcher` is
a `testRuntimeOnly` dependency. This ensures that tests can be run from
Eclipse.

Closes gh-25074
2021-02-01 15:31:28 -08:00
Andy Wilkinson
3585d20453 Include IDialect beans in WebFluxTest and WebMvcTest
Fixes gh-24149
2021-02-01 15:03:08 +00:00
Phillip Webb
187258aa6a Fix classpath.idx format documentation
Since 2.3.8 and 2.4.2 the format includes the directory.

Closes gh-24856
2021-01-30 17:56:09 -08:00
Phillip Webb
19c5864d2c Clarify square bracket map binding notation
Update reference docs to make it clearer when the square bracket map
binding notation should be used.

Closes gh-23390
2021-01-30 17:42:49 -08:00
Phillip Webb
549d4f7fbe Document that Spring MVC has own ConversionService
Update documentation to make it clearer that Spring MVC does not use the
`ApplicationConversionService` unless configured explicitly.

Closes gh-22718
2021-01-30 17:03:55 -08:00
Andy Wilkinson
5360ca6500 Merge pull request #25048 from dreis2211
* gh-25048:
  Fix duplicate anchor id

Closes gh-25048
2021-01-29 09:06:27 +00:00
dreis2211
4940694db2 Fix duplicate anchor id
See gh-25048
2021-01-29 09:06:06 +00:00
Phillip Webb
c03d8773e7 Improve logging.register-shutdown-hook docs
Update the "Logging" reference documentation with a section about
shutting down the logging system.

Closes gh-24507
2021-01-28 19:26:18 -08:00
Phillip Webb
1b908ab9c8 Merge pull request #25012 from jongmin92
* pr/25012:
  Document missing code to run Gradle bootRun task

Closes gh-25012
2021-01-28 18:56:46 -08:00
jongmin92
23ecb86089 Document missing code to run Gradle bootRun task
See gh-25012
2021-01-28 18:56:21 -08:00
Phillip Webb
745dbaff9c Merge pull request #24982 from robert-smith-911
* pr/24982:
  Polish 'Add note about exploded jars and banner properties'
  Add note about exploded jars and banner properties

Closes gh-24982
2021-01-28 18:48:33 -08:00
Phillip Webb
5b2d1f19a0 Polish 'Add note about exploded jars and banner properties'
See gh-24982
2021-01-28 18:48:14 -08:00
Robert Smith
33c038199d Add note about exploded jars and banner properties
Add a note to the "Customizing the Banner" explaining that you need
to be using the `JarLauncher` to use the `application.*` properties.

See gh-24982
2021-01-28 18:48:11 -08:00
Phillip Webb
7265484d76 Merge pull request #24336 from wesuga
* pr/24336:
  Polish 'Add a tip about actuator endpoints'
  Add a tip about actuator endpoints

Closes gh-24336
2021-01-28 17:59:11 -08:00
Phillip Webb
60bb33f231 Polish 'Add a tip about actuator endpoints'
See gh-24336
2021-01-28 17:55:09 -08:00
Wesley Ugang
6ced1d7f4e Add a tip about actuator endpoints
Update the "Externalized Configuration" section with a tip that about
the actuator `env` and `configprops` endpoints.

See gh-24336
2021-01-28 17:53:04 -08:00
Andy Wilkinson
a4e6a3cfd0 Merge branch '2.2.x' into 2.3.x
Closes gh-25028
2021-01-28 09:30:01 +00:00
Andy Wilkinson
73b9615e0c Upgrade Java 15 CI image to jdk-15.0.2+7
Closes gh-25013
2021-01-28 09:27:26 +00:00
Andy Wilkinson
bc5e2853e1 Merge branch '2.2.x' into 2.3.x
Closes gh-25027
2021-01-28 09:25:27 +00:00
Andy Wilkinson
06c76b8643 Upgrade Java 11 CI image to jdk-11.0.10+9
Closes gh-25014
2021-01-28 09:25:02 +00:00
Andy Wilkinson
e04863d15b Merge branch '2.2.x' into 2.3.x
Closes gh-25022
2021-01-28 09:23:15 +00:00
Andy Wilkinson
6ccfa0f554 Upgrade Java 8 CI image to jdk8u282b08
Closes gh-25019
2021-01-28 09:22:54 +00:00
Andy Wilkinson
223b4e4a6f Merge branch '2.2.x' into 2.3.x
Closes gh-25021
2021-01-28 09:02:45 +00:00