Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some various upgrades, fixes and refactoring

Browse Source 
* Upgrade to SA and SF snapshots
* Address TODOs regarding those upgrades
* Resolve some other TODOs
* Replace `PropertyPlaceholderConfigurer` beans with the `<context:property-placeholder>`
* Upgrade to Spring Social Twitter 1.1.2 and resolve deprecations via mocks (https://github.com/spring-projects/spring-social-twitter/issues/91)
* Upgrade to Curator `3.1.0` and resolve deprecation in the `ZookeeperMetadataStore`
This commit is contained in:
Artem Bilan
2016-04-25 23:32:14 -04:00
parent 3390734a99
commit 47d7a67bda
43 changed files with 420 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessagingGatewaySupportRegistrationTests.java
View File

@@ -66,8 +66,7 @@ public class MessagingGatewaySupportRegistrationTests {
@Configuration
@EnableIntegration
// TODO INT-3869
@EnableIntegrationMBeanExport(server = "server")
@EnableIntegrationMBeanExport
public static class ContextConfiguration {
@Bean
@@ -101,7 +100,7 @@ public class MessagingGatewaySupportRegistrationTests {
}
@Bean
public MBeanServerFactoryBean server() {
public static MBeanServerFactoryBean server() {
MBeanServerFactoryBean fb = new MBeanServerFactoryBean();
fb.setLocateExistingServerIfPossible(true);
return fb;