Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
37,207 Commits 23 Branches 0 Tags
72dd51ae0b3a97562df613d1f403456094e09be9
Commit Graph

37207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
72dd51ae0b Merge branch '2.6.x' into 2.7.x 
Closes gh-31354
 2022-06-13 14:29:18 +02:00
Stephane Nicoll
d7fa384c5f Merge pull request #31143 from hpoettker 
* pr/31143:
  Use Lambda-based API in Spring Security examples

Closes gh-31143
 2022-06-13 13:54:09 +02:00
Henning Poettker
9fdd471adf Use Lambda-based API in Spring Security examples 
See gh-31143
 2022-06-13 13:15:56 +02:00
Stephane Nicoll
53689a295d Merge branch '2.6.x' into 2.7.x 2022-06-13 12:44:13 +02:00
Stephane Nicoll
d3b4cbada8 Set LATEST_GA to false in CI pipeline 
Closes gh-31120
 2022-06-13 12:43:34 +02:00
Phillip Webb
7bf82b5349 Merge branch '2.6.x' into 2.7.x 2022-06-10 16:13:35 -07:00
Phillip Webb
63fdd729f5 Refine conversion service type check 
Update fix to account for primitive types.

See gh-28592
 2022-06-10 16:12:38 -07:00
Phillip Webb
beb1c15219 Merge branch '2.6.x' into 2.7.x 
Closes gh-31341
 2022-06-10 14:30:02 -07:00
Phillip Webb
31b0264d94 Ensure conversion service actually converts to the correct type 
Update `BindConverter` with a guard to ensure that the resulting object
is the correct type.

Fixes gh-28592
 2022-06-10 14:29:25 -07:00
Phillip Webb
64922994e8 Merge pull request #31277 from anthonyvdotbe 
* pr/31277:
  Fix typo in ImportCandidates javadoc

Closes gh-31277
 2022-06-10 12:43:27 -07:00
Anthony Vanelverdinghe
ed1e7382ab Fix typo in ImportCandidates javadoc 
See gh-31277
 2022-06-10 12:42:43 -07:00
Phillip Webb
b4b8956fba Merge pull request #31132 from pirgeo 
* pr/31132:
  Polish 'Update Dynatrace documentation for Micrometer 1.9.0'
  Update Dynatrace documentation for Micrometer 1.9.0

Closes gh-31132
 2022-06-10 12:37:55 -07:00
Phillip Webb
0f7fa84214 Polish 'Update Dynatrace documentation for Micrometer 1.9.0' 
See gh-31132
 2022-06-10 12:36:45 -07:00
Georg Pirklbauer
6df9f50642 Update Dynatrace documentation for Micrometer 1.9.0 
Update the actuator documentation for Dynatrace to reflect the
updates and improvements that were made in Micrometer 1.9.0.

See gh-31132
 2022-06-10 12:34:05 -07:00
Andy Wilkinson
7f584a95a6 Merge branch '2.6.x' into 2.7.x 
Closes gh-31329
 2022-06-10 11:35:54 +01:00
Andy Wilkinson
e02803d341 Configure max HTTP header size when using HTTP2 with Tomcat 
Closes gh-31322
 2022-06-10 11:32:57 +01:00
Andy Wilkinson
29cd148e05 Start building against Spring Framework 5.3.1 snapshots 
See gh-31319
 2022-06-09 20:55:14 +01:00
Andy Wilkinson
85887b5411 Merge branch '2.6.x' into 2.7.x 2022-06-09 20:54:08 +01:00
Andy Wilkinson
ed897fc922 Start building against Spring Framework 5.3.21 snapshots 
See gh-31318
 2022-06-09 19:37:50 +01:00
Stephane Nicoll
79759f7270 Merge branch '2.6.x' into 2.7.x 2022-06-09 08:05:58 +02:00
Stephane Nicoll
152766c07a Upgrade CI to Docker 20.10.17 
Closes gh-31289
 2022-06-09 08:02:07 +02:00
Stephane Nicoll
d39f4efb05 Upgrade Java 18 version in CI image 
Closes gh-31292
 2022-06-09 08:01:32 +02:00
Stephane Nicoll
a932555539 Upgrade Java 17 version in CI image 
Closes gh-31284
 2022-06-09 08:00:55 +02:00
Stephane Nicoll
1c85e1083a Upgrade Java 11 version in CI image 
Closes gh-31285
 2022-06-09 08:00:26 +02:00
Stephane Nicoll
87840c755b Upgrade Java 8 version in CI image 
Closes gh-31286
 2022-06-09 07:59:58 +02:00
Stephane Nicoll
1a8c1217ed Upgrade Ubuntu version in CI images 
Closes gh-31288
 2022-06-09 07:59:27 +02:00
Stephane Nicoll
b028263663 Upgrade CI to Docker 20.10.17 
Closes gh-31297
 2022-06-09 07:58:28 +02:00
Stephane Nicoll
f96f21c8a2 Upgrade Java 18 version in CI image 
Closes gh-31294
 2022-06-09 07:58:28 +02:00
Stephane Nicoll
c07623e040 Upgrade Java 17 version in CI image 
Closes gh-31290
 2022-06-09 07:58:28 +02:00
Stephane Nicoll
4822c9b809 Upgrade Java 11 version in CI image 
Closes gh-31293
 2022-06-09 07:58:27 +02:00
Stephane Nicoll
976f1ac355 Upgrade Java 8 version in CI image 
Closes gh-31291
 2022-06-09 07:58:27 +02:00
Stephane Nicoll
ea85dccd61 Upgrade Ubuntu version in CI images 
Closes gh-31287
 2022-06-09 07:58:27 +02:00
Andy Wilkinson
12eb7a8795 Merge branch '2.6.x' into 2.7.x 
Closes gh-31282
 2022-06-08 19:24:07 +01:00
Andy Wilkinson
a651061e2c Remove SpringApplicationHierarchyTests 
Closes gh-31281
 2022-06-08 19:23:26 +01:00
Andy Wilkinson
a0fee42740 Merge branch '2.6.x' into 2.7.x 
Closes gh-31270
 2022-06-08 12:09:14 +01:00
Andy Wilkinson
4c23d2c45b Merge pull request #31267 from vpavic 
* gh-31267:
  Polish "Update smoke tests to avoid conflicts with NAME environment variable"
  Update smoke tests to avoid conflicts with NAME environment variable

Closes gh-31267
 2022-06-08 12:08:57 +01:00
Andy Wilkinson
0834dc5b01 Polish "Update smoke tests to avoid conflicts with NAME environment variable" 
See gh-31267
 2022-06-08 12:08:40 +01:00
Vedran Pavic
95e0d6c0f7 Update smoke tests to avoid conflicts with NAME environment variable 
This commit updates several smoke tests in order to avoid conflicts
with NAME environment variable that is present in WSL and causes
project build to fail. Previous attempt to fix this in 7da42d71 was
incomplete.

See gh-31267
 2022-06-08 11:34:19 +01:00
Stephane Nicoll
8e550933a8 Merge branch '2.6.x' into 2.7.x 
Closes gh-31261
 2022-06-07 09:16:10 +02:00
Stephane Nicoll
bbb5966bca Upgrade integration tests to Apache Maven 3.8.5 
Closes gh-31260
 2022-06-07 09:15:41 +02:00
Andy Wilkinson
c379456722 Remove dependency management for spring-ldap-ldif-batch 
The spring-ldap-ldif-batch module was removed in Spring LDAP 2.4.0 in
favor of the equivalent code that already exists in Spring Batch.
This commit aligns Boot's dependency management with this removal.

Closes gh-31254
 2022-06-06 17:01:28 +01:00
Andy Wilkinson
7f291f8da0 Merge branch '2.6.x' into 2.7.x 
Closes gh-31220
 2022-05-31 11:14:08 +01:00
Andy Wilkinson
348662b15e Remove unused deduceFromApplicationContext and supporting code 
Closes gh-31218
 2022-05-31 10:57:22 +01:00
Andy Wilkinson
430040415b Merge branch '2.6.x' into 2.7.x 2022-05-30 19:22:37 +01:00
Andy Wilkinson
0b6c147a87 Polish 2022-05-30 19:22:30 +01:00
Andy Wilkinson
d1420b6abb Merge branch '2.6.x' into 2.7.x 
Closes gh-31213
 2022-05-30 18:24:00 +01:00
Andy Wilkinson
da8dafe138 Make afterResolve hook used by bootJar and bootWar more robust 
Previously, ResolvedDependencies used hasError on
ResolvedConfiguration to check that it was safe to work with all
of the resolved configuration's artifacts and their files. This
check is not sufficient as errors can still occur later on.

This commit updates ResolvedDependencies to use a lenient
configuration, thereby avoiding any problems that may be caused by
errors that occur after the hasError check.

Closes gh-30586
 2022-05-30 18:19:47 +01:00
Andy Wilkinson
70bcade232 Merge branch '2.6.x' into 2.7.x 
Closes gh-31211
 2022-05-30 17:16:53 +01:00
Andy Wilkinson
419ac26e0d Use conventions for source and encoding of aggregatedJavadoc 
Closes gh-31210
 2022-05-30 17:15:45 +01:00
Stephane Nicoll
dd437c4cf4 Merge branch '2.6.x' into 2.7.x 
Closes gh-31208
 2022-05-30 15:14:08 +02:00