You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Chris Beams
ce4be3b46b
Merge branch '3.2.x' into master
Conflicts:
gradle.properties
spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
|
13 years ago |
| .. |
|
src
|
Merge branch '3.2.x' into master
|
13 years ago |
|
.springBeans
|
Rename modules {org.springframework.*=>spring-*}
|
14 years ago |