Merge branch '2.5.x' into 2.6.x

Closes gh-30330

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/web/servlet/springmvc/json/MyJsonComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,8 +37,10 @@ public static class Serializer extends JsonSerializer<MyObject> {
 
 		@Override
 		public void serialize(MyObject value, JsonGenerator jgen, SerializerProvider serializers) throws IOException {
+			jgen.writeStartObject();
 			jgen.writeStringField("name", value.getName());
 			jgen.writeNumberField("age", value.getAge());
+			jgen.writeEndObject();
 		}
 
 	}