Merge branch '5.3.x'

snicoll · snicoll · commit 28ca0dd64209 · 2022-07-29T09:31:50.000+02:00
diff --git a/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/AbstractEncoder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-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.
@@ -27,7 +27,7 @@
 import org.springframework.util.MimeType;
 
 /**
- * Abstract base class for {@link Decoder} implementations.
+ * Abstract base class for {@link Encoder} implementations.
  *
  * @author Sebastien Deleuze
  * @author Arjen Poutsma

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2019 the original author or authors.`
	`2`	`+ * Copyright 2002-2022 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -27,7 +27,7 @@`
`27`	`27`	`import org.springframework.util.MimeType;`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * Abstract base class for {@link Decoder} implementations.`
	`30`	`+ * Abstract base class for {@link Encoder} implementations.`
`31`	`31`	`*`
`32`	`32`	`* @author Sebastien Deleuze`
`33`	`33`	`* @author Arjen Poutsma`