Skip to content

Commit dc822cd

Browse files
committed
Reflect 3.2=>3.1.2 backports in @SInCE tags etc
Issue: SPR-9443, SPR-6847, SPR-9446, SPR-9444, SPR-9439, SPR-9302, SPR-9507, SPR-9238, SPR-9397, SPR-9406, SPR-9502
1 parent f6de5d4 commit dc822cd

File tree

10 files changed

+13
-14
lines changed

10 files changed

+13
-14
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* Spring's {@link Qualifier @Qualifier} annotation.
3636
*
3737
* @author Chris Beams
38-
* @since 3.2
38+
* @since 3.1.2
3939
* @see BeanFactoryUtils
4040
*/
4141
public class BeanFactoryAnnotationUtils {
@@ -49,7 +49,6 @@ public class BeanFactoryAnnotationUtils {
4949
* @param qualifier the qualifier for selecting between multiple bean matches
5050
* @return the matching bean of type {@code T} (never {@code null})
5151
* @throws IllegalStateException if no matching bean of type {@code T} found
52-
* @since 3.2
5352
*/
5453
public static <T> T qualifiedBeanOfType(BeanFactory beanFactory, Class<T> beanType, String qualifier) {
5554
if (beanFactory instanceof ConfigurableListableBeanFactory) {

spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationInterceptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* of that class. By default, JSR-303 will validate against its default group only.
4747
*
4848
* <p>As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or higher.
49-
* In Spring 3.2, this class will autodetect a Bean Validation 1.1 compliant provider
49+
* In Spring 3.1.2, this class will autodetect a Bean Validation 1.1 compliant provider
5050
* and automatically use the standard method validation support there (once available).
5151
*
5252
* @author Juergen Hoeller

spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationPostProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
* as well. By default, JSR-303 will validate against its default group only.
5959
*
6060
* <p>As of Spring 3.1, this functionality requires Hibernate Validator 4.2 or higher.
61-
* In Spring 3.2, this class will autodetect a Bean Validation 1.1 compliant provider
61+
* In Spring 3.1.2, this class will autodetect a Bean Validation 1.1 compliant provider
6262
* and automatically use the standard method validation support there (once available).
6363
*
6464
* @author Juergen Hoeller

spring-core/src/main/java/org/springframework/core/env/ConfigurableEnvironment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public interface ConfigurableEnvironment extends Environment, ConfigurableProper
164164
* reflected in the child. Therefore, care should be taken to configure parent
165165
* property sources and profile information prior to calling {@code merge}.
166166
* @param parent the environment to merge with
167-
* @since 3.2
167+
* @since 3.1.2
168168
* @see org.springframework.context.support.AbstractApplicationContext#setParent
169169
*/
170170
void merge(ConfigurableEnvironment parent);

spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAspectUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Juergen Hoeller
3030
* @author Chris Beams
3131
* @since 3.0.2
32-
* @deprecated as of Spring 3.2 in favor of {@link BeanFactoryUtils}
32+
* @deprecated as of Spring 3.1.2 in favor of {@link BeanFactoryUtils}
3333
*/
3434
@Deprecated
3535
public abstract class TransactionAspectUtils {
@@ -40,7 +40,7 @@ public abstract class TransactionAspectUtils {
4040
* @param qualifier the qualifier for selecting between multiple {@code PlatformTransactionManager} matches
4141
* @return the chosen {@code PlatformTransactionManager} (never {@code null})
4242
* @throws IllegalStateException if no matching {@code PlatformTransactionManager} bean found
43-
* @deprecated as of Spring 3.2 in favor of
43+
* @deprecated as of Spring 3.1.2 in favor of
4444
* {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)}
4545
*/
4646
public static PlatformTransactionManager getTransactionManager(BeanFactory beanFactory, String qualifier) {
@@ -53,7 +53,7 @@ public static PlatformTransactionManager getTransactionManager(BeanFactory beanF
5353
* @param qualifier the qualifier for selecting between multiple {@code PlatformTransactionManager} matches
5454
* @return the chosen {@code PlatformTransactionManager} (never {@code null})
5555
* @throws IllegalStateException if no matching {@code PlatformTransactionManager} bean found
56-
* @deprecated as of Spring 3.2 in favor of
56+
* @deprecated as of Spring 3.1.2 in favor of
5757
* {@link BeanFactoryAnnotationUtils#qualifiedBeanOfType(BeanFactory, Class, String)}
5858
*/
5959
public static PlatformTransactionManager getTransactionManager(ConfigurableListableBeanFactory bf, String qualifier) {

spring-web/src/main/java/org/springframework/http/converter/json/MappingJackson2HttpMessageConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*
4848
* @author Arjen Poutsma
4949
* @author Keith Donald
50-
* @since 3.2
50+
* @since 3.1.2
5151
* @see org.springframework.web.servlet.view.json.MappingJackson2JsonView
5252
*/
5353
public class MappingJackson2HttpMessageConverter extends AbstractHttpMessageConverter<Object> {

spring-web/src/main/java/org/springframework/web/client/HttpClientErrorException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public HttpClientErrorException(HttpStatus statusCode, String statusText,
7373
* @param responseHeaders the response headers, may be {@code null}
7474
* @param responseBody the response body content, may be {@code null}
7575
* @param responseCharset the response body charset, may be {@code null}
76-
* @since 3.2
76+
* @since 3.1.2
7777
*/
7878
public HttpClientErrorException(HttpStatus statusCode, String statusText,
7979
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {

spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public HttpServerErrorException(HttpStatus statusCode, String statusText,
7474
* @param responseHeaders the response headers, may be {@code null}
7575
* @param responseBody the response body content, may be {@code null}
7676
* @param responseCharset the response body charset, may be {@code null}
77-
* @since 3.2
77+
* @since 3.1.2
7878
*/
7979
public HttpServerErrorException(HttpStatus statusCode, String statusText,
8080
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {

spring-web/src/main/java/org/springframework/web/client/HttpStatusCodeException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected HttpStatusCodeException(HttpStatus statusCode,
8989
* @param responseHeaders the response headers, may be {@code null}
9090
* @param responseBody the response body content, may be {@code null}
9191
* @param responseCharset the response body charset, may be {@code null}
92-
* @since 3.2
92+
* @since 3.1.2
9393
*/
9494
protected HttpStatusCodeException(HttpStatus statusCode, String statusText,
9595
HttpHeaders responseHeaders, byte[] responseBody, Charset responseCharset) {
@@ -118,7 +118,7 @@ public String getStatusText() {
118118

119119
/**
120120
* Return the HTTP response headers.
121-
* @since 3.2
121+
* @since 3.1.2
122122
*/
123123
public HttpHeaders getResponseHeaders() {
124124
return this.responseHeaders;

spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
* @author Jeremy Grelle
4949
* @author Arjen Poutsma
5050
* @author Rossen Stoyanchev
51-
* @since 3.2
51+
* @since 3.1.2
5252
* @see org.springframework.http.converter.json.MappingJackson2HttpMessageConverter
5353
*/
5454
public class MappingJackson2JsonView extends AbstractView {

0 commit comments

Comments
 (0)