Commit Graph

40880 Commits

Author SHA1 Message Date
Andy Wilkinson
3bcc7ece55 Merge branch '2.7.x'
Closes gh-33676
2023-01-03 16:09:51 +00:00
Andy Wilkinson
84c021bc97 Upgrade to Gradle Enterprise Gradle Plugin 3.12.1
Closes gh-33672
2023-01-03 15:57:48 +00:00
Andy Wilkinson
ce91415a27 Merge branch '2.7.x'
Closes gh-33675
2023-01-03 15:54:41 +00:00
Andy Wilkinson
68531bfba9 Upgrade to Gradle Enterprise Conventions 0.0.12
Closes gh-33674
2023-01-03 15:54:03 +00:00
Spring Builds
61e87a6406 Next development version (v3.0.2-SNAPSHOT) 2022-12-22 21:36:02 +00:00
Scott Frederick
5929d95604 Merge branch '2.7.x' 2022-12-22 11:55:13 -06:00
Spring Builds
b10b788cd8 Next development version (v2.7.8-SNAPSHOT) 2022-12-22 17:24:07 +00:00
Phillip Webb
f588793445 Update copyright year of changed files 2022-12-22 01:00:42 -08:00
Phillip Webb
0254619782 Merge branch '2.7.x' 2022-12-22 00:59:40 -08:00
Phillip Webb
e4772cf3b7 Update copyright year of changed files 2022-12-22 00:59:32 -08:00
Phillip Webb
2e7ca6f82d Warning if <springProfile> is used in phase 2 model elements
Add `SpringProfileIfNestedWithinSecondPhaseElementSanityChecker` which
will provide a warning if `<springProfile>` is used within a phase 2
model element. This is similar to Logback's own `<if>` warnings.

The `LogbackLoggingSystem` has also been updated so that warning are
printed when present.

Fixes gh-33610
2022-12-22 00:57:59 -08:00
Phillip Webb
2ed512ddb5 Use model.deepMarkAsSkipped in SpringProfileModelHandler
Switch `model.markAsSkipped` to `model.deepMarkAsSkipped` in
`SpringProfileModelHandler`.

Although the current call doesn't appear to be causing issues,
it seems best to align our <springProfile> support with the way
that Logback implements its own `<if>` support.

Closes gh-33618
2022-12-22 00:54:06 -08:00
Phillip Webb
532fed3147 Increase couchbase connection timeout for tests 2022-12-22 00:49:04 -08:00
Phillip Webb
9562a2c2f1 Merge branch '2.7.x' 2022-12-21 23:01:57 -08:00
Phillip Webb
60a75e3799 Increase timeout for ApplicationRunner task 2022-12-21 23:00:10 -08:00
Phillip Webb
6367a8c62c Merge branch '2.7.x' 2022-12-21 22:54:01 -08:00
Phillip Webb
5ba52d0000 Polish formatting 2022-12-21 22:53:54 -08:00
Phillip Webb
e57824fb58 Merge branch '2.7.x'
Closes gh-33617
2022-12-21 22:52:59 -08:00
Phillip Webb
df08eb8b63 Merge pull request #33614 from shekharAggarwal
* pr/33614:
  Polish 'Improve gradle plugin tags documentation'
  Improve gradle plugin tags documentation

Closes gh-33614
2022-12-21 22:52:51 -08:00
Phillip Webb
a2a59dd627 Polish 'Improve gradle plugin tags documentation'
See gh-33614
2022-12-21 22:52:27 -08:00
Shekhar Aggarwal
a1df607dd8 Improve gradle plugin tags documentation
See gh-33614
2022-12-21 22:50:02 -08:00
Phillip Webb
5814543bb1 Merge branch '2.7.x'
Closes gh-33616
2022-12-21 22:49:40 -08:00
Phillip Webb
2b886c1212 Merge pull request #33609 from shekharAggarwal
* pr/33609:
  Polish 'Improve maven plugin tags documentation'
  Improve maven plugin tags documentation

Closes gh-33609
2022-12-21 22:47:58 -08:00
Phillip Webb
c205ba0694 Polish 'Improve maven plugin tags documentation'
See gh-33609
2022-12-21 22:47:28 -08:00
Shekhar Aggarwal
79557012a7 Improve maven plugin tags documentation
See gh-33609
2022-12-21 22:46:42 -08:00
Phillip Webb
94819ee313 Merge branch '2.7.x'
Closes gh-33615
2022-12-21 22:39:34 -08:00
Phillip Webb
b7eb7f214b Merge pull request #33569 from Artur-
* pr/33569:
  Polish 'Fix typo in LocalDevToolsAutoConfiguration logging'
  Fix typo in LocalDevToolsAutoConfiguration logging

Closes gh-33569
2022-12-21 22:39:19 -08:00
Phillip Webb
42aa661e69 Polish 'Fix typo in LocalDevToolsAutoConfiguration logging'
See gh-33569
2022-12-21 22:35:38 -08:00
Artur
549c9e5076 Fix typo in LocalDevToolsAutoConfiguration logging
See gh-33569
2022-12-21 22:35:05 -08:00
Phillip Webb
c67915f946 Merge branch '2.7.x'
Closes gh-33612
2022-12-21 22:30:20 -08:00
Phillip Webb
4610fe3e44 Upgrade CI to Docker 20.10.22
Closes gh-33613
2022-12-21 22:29:59 -08:00
Phillip Webb
6d16aed36e Merge branch '2.7.x' 2022-12-21 22:26:57 -08:00
Phillip Webb
816728186a Clean ant lib folder before build
Update `spring-boot-smoke-test-ant` so that the ant lib folder is always
cleaned. Prior to this commit, it was possible for the folder to contain
stale artifacts.
2022-12-21 22:25:52 -08:00
Phillip Webb
c257f2b1d2 Merge branch '2.7.x' 2022-12-21 11:37:41 -08:00
Phillip Webb
e8e56dbb11 Remove spring-boot-smoke-test-webflux-ssl
Remove `spring-boot-smoke-test-webflux-ssl` since it's more of
an integration test than a smoke test. We could consider
relocating it to `spring-boot-integration-tests` but since we
have unit tests with a mock PCKCS11 security it's probably
best to see if we can get away without it.

See gh-32179
2022-12-21 10:19:03 -08:00
Phillip Webb
bc6fc33498 Polish 2022-12-21 10:16:25 -08:00
Scott Frederick
fead976952 Adapt to changes in Couchbase client
See gh-33588
2022-12-21 11:48:39 -06:00
Phillip Webb
5f30a70581 Upgrade to Undertow 2.3.2.Final
Closes gh-33608
2022-12-21 08:47:20 -08:00
Phillip Webb
41f5cd3fde Upgrade to UnboundID LDAPSDK 6.0.7
Closes gh-33607
2022-12-21 08:47:18 -08:00
Phillip Webb
ed9dd0783a Upgrade to Thymeleaf Extras SpringSecurity 3.1.1.RELEASE
Closes gh-33606
2022-12-21 08:32:10 -08:00
Phillip Webb
bf855cf053 Upgrade to Spring Integration 6.0.1
Closes gh-33605
2022-12-21 08:22:26 -08:00
Phillip Webb
952c439c9e Upgrade to SLF4J 2.0.6
Closes gh-33604
2022-12-21 08:22:22 -08:00
Phillip Webb
cc8236f1c4 Upgrade to Netty 4.1.86.Final
Closes gh-33603
2022-12-21 08:22:20 -08:00
Phillip Webb
f15f130953 Upgrade to Native Build Tools Plugin 0.9.19
Closes gh-33602
2022-12-21 08:22:18 -08:00
Phillip Webb
2a77f5fa6e Upgrade to MSSQL JDBC 11.2.2.jre17
Closes gh-33601
2022-12-21 08:22:15 -08:00
Phillip Webb
7e57a100e8 Upgrade to MongoDB 4.8.1
Closes gh-33600
2022-12-21 08:22:13 -08:00
Phillip Webb
29c0eb13d7 Upgrade to Lettuce 6.2.2.RELEASE
Closes gh-33599
2022-12-21 08:22:10 -08:00
Phillip Webb
66cf72b5ad Upgrade to Kotlin 1.7.22
Closes gh-33598
2022-12-21 08:22:07 -08:00
Phillip Webb
b0b20e4e42 Upgrade to jOOQ 3.17.6
Closes gh-33597
2022-12-21 08:22:05 -08:00
Phillip Webb
19f19559aa Upgrade to Jetty 11.0.13
Closes gh-33596
2022-12-21 08:22:02 -08:00