Andy Wilkinson
15dafebe0d
Polish "Avoid split java.xml packages that cause JDT compile errors"
...
See gh-29389
2022-01-14 12:43:16 +00:00
Dave Syer
32a6c7df49
Avoid split java.xml packages that cause JDT compile errors
...
Without this change I get compiler errors from JDT in the IDE
(VSCode). It seems to be harmless from the point of view of the
command line build with the JDK.
See gh-29389
2022-01-14 12:42:02 +00:00
Stephane Nicoll
abb88b9aeb
Upgrade to Micrometer 2.0.0-M1
...
Closes gh-29279
2022-01-14 09:09:17 +01:00
Andy Wilkinson
a79cba129f
Remove faulty javadoc styling
...
The styling does not work with Java 17-generated javadoc. Following
Spring Framework's lead, this commit removes the custom styling.
See gh-28101
2022-01-13 15:39:34 +00:00
Stephane Nicoll
9a9cfa78c8
Merge branch '2.7.x'
2022-01-13 15:31:38 +01:00
Stephane Nicoll
77a9d0b6f1
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29381
2022-01-13 15:31:31 +01:00
Omkar Shetkar
c19e192acd
Fix duplicate "Logging" link
...
See gh-29380
2022-01-13 15:30:21 +01:00
Stephane Nicoll
5161e5a5f2
Upgrade to Spring Framework 6.0.0-M2
...
Closes gh-28642
2022-01-13 14:41:50 +01:00
Stephane Nicoll
d82fbcb43b
Upgrade to Micrometer 1.9.0-M2
...
Closes gh-29282
2022-01-13 14:40:27 +01:00
Stephane Nicoll
7a0f7c498f
Upgrade to Spring Framework 5.3.15
...
Closes gh-29328
2022-01-13 14:39:51 +01:00
Stephane Nicoll
832d8845df
Upgrade to Micrometer 1.8.2
...
Closes gh-29316
2022-01-13 14:38:40 +01:00
Stephane Nicoll
f65d766fbe
Upgrade to Spring Framework 5.3.15
...
Closes gh-29327
2022-01-13 14:38:07 +01:00
Stephane Nicoll
4dac38cb63
Merge branch '2.7.x'
2022-01-13 08:46:08 +01:00
Stephane Nicoll
1bf13371c4
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29378
2022-01-13 08:45:59 +01:00
Stephane Nicoll
8384019a41
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29377
2022-01-13 08:45:48 +01:00
Stephane Nicoll
5f03ace40f
Update copyright year of changed file
...
See gh-29112
2022-01-13 08:43:03 +01:00
izeye
74c522c745
Polish SpringBootContextLoaderTests
...
See gh-29112
2022-01-13 08:42:36 +01:00
Phillip Webb
13f257a706
Merge branch '2.7.x'
2022-01-12 15:44:47 -08:00
Phillip Webb
8147eb6d6d
Merge branch '2.6.x' into 2.7.x
2022-01-12 15:43:44 -08:00
Phillip Webb
e7fe371927
Merge branch '2.5.x' into 2.6.x
2022-01-12 15:43:11 -08:00
Phillip Webb
27ad0804f5
Update copyright year of changed files
2022-01-12 15:42:25 -08:00
Phillip Webb
3d6840e715
Merge branch '2.7.x'
...
Closes gh-29376
2022-01-12 15:32:51 -08:00
Phillip Webb
fee45e056a
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29375
2022-01-12 15:32:34 -08:00
Phillip Webb
91d2b1b988
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29374
2022-01-12 15:32:00 -08:00
Phillip Webb
eb6b48fff0
Use side-effect free environment with tests rather than converting
...
Refine the logic introduced in 64270eca
to use a side-effect free
Environment implementation rather than converting the Environment early.
Early conversion can cause condition evaluation issues if
`src/test/resources/application.properties` files are bound to the
`SpringApplication`. Specifically the `spring.main.web-application-type`
property can change the `Environment` type which must happen before
conditions are evaluated.
Fixes gh-29169
2022-01-12 14:21:52 -08:00
Phillip Webb
1b7db2750d
Merge branch '2.7.x'
...
Closes gh-29373
2022-01-12 14:08:04 -08:00
Phillip Webb
e1c84e2972
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29372
2022-01-12 14:07:48 -08:00
Phillip Webb
72696cdb0f
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29371
2022-01-12 14:07:31 -08:00
Phillip Webb
9cf55808fb
Ensure run user actually exists
...
Update `launch.script` so that the `run_user` variable is only set when
the user actually exists. Prior to this commit, if the jar file was
owned by a non-existing user the startup script could fail.
Fixes gh-29370
2022-01-12 14:05:30 -08:00
Phillip Webb
ef9a258174
Merge branch '2.7.x'
...
Closes gh-29369
2022-01-12 13:54:52 -08:00
Phillip Webb
ae4d9ccb2d
Merge branch '2.6.x' into 2.7.x
...
Closes gh-29368
2022-01-12 13:54:39 -08:00
Phillip Webb
3ae7c45900
Merge branch '2.5.x' into 2.6.x
...
Closes gh-29367
2022-01-12 13:54:23 -08:00
Phillip Webb
827309f36f
Upgrade to Testcontainers 1.16.2
...
Closes gh-29366
2022-01-12 13:52:43 -08:00
Stephane Nicoll
ee938cf822
Upgrade to Netty 4.1.73.Final
...
Closes gh-29351
2022-01-12 14:33:55 +01:00
Stephane Nicoll
d8739c463b
Upgrade to MongoDB 4.4.1
...
Closes gh-29350
2022-01-12 14:33:54 +01:00
Stephane Nicoll
e14c13c75f
Upgrade to Maven Jar Plugin 3.2.2
...
Closes gh-29349
2022-01-12 14:33:52 +01:00
Stephane Nicoll
8cdccb6cb3
Upgrade to Logback 1.2.10
...
Closes gh-29348
2022-01-12 14:33:51 +01:00
Stephane Nicoll
61e08e3510
Upgrade to Lettuce 6.1.6.RELEASE
...
Closes gh-29347
2022-01-12 14:33:50 +01:00
Stephane Nicoll
b19593ee47
Upgrade to JBoss Logging 3.4.3.Final
...
Closes gh-29346
2022-01-12 14:33:49 +01:00
Stephane Nicoll
98118bc480
Upgrade to Jaybird 4.0.5.java8
...
Closes gh-29345
2022-01-12 14:33:47 +01:00
Stephane Nicoll
838cded308
Upgrade to Infinispan 12.1.11.Final
...
Closes gh-29344
2022-01-12 14:33:46 +01:00
Stephane Nicoll
4309b78f02
Upgrade to HttpCore5 5.1.3
...
Closes gh-29343
2022-01-12 14:33:45 +01:00
Stephane Nicoll
ca39780ff3
Upgrade to Netty 4.1.73.Final
...
Closes gh-29341
2022-01-12 13:51:24 +01:00
Stephane Nicoll
cb1db78c37
Upgrade to Maven Jar Plugin 3.2.2
...
Closes gh-29340
2022-01-12 13:51:23 +01:00
Stephane Nicoll
db9097b0d6
Upgrade to Logback 1.2.10
...
Closes gh-29339
2022-01-12 13:51:21 +01:00
Stephane Nicoll
d23a665bdc
Upgrade to Lettuce 6.1.6.RELEASE
...
Closes gh-29338
2022-01-12 13:51:20 +01:00
Stephane Nicoll
36811f9e1e
Upgrade to JBoss Logging 3.4.3.Final
...
Closes gh-29337
2022-01-12 13:51:19 +01:00
Stephane Nicoll
7125bd3779
Upgrade to Jaybird 4.0.5.java8
...
Closes gh-29336
2022-01-12 13:51:18 +01:00
Stephane Nicoll
404fb521ec
Upgrade to Infinispan 12.1.11.Final
...
Closes gh-29335
2022-01-12 13:51:17 +01:00
Stephane Nicoll
33da06cff0
Upgrade to HttpCore5 5.1.3
...
Closes gh-29334
2022-01-12 13:51:15 +01:00