diff --git a/build.gradle b/build.gradle index 2df0dfdc99..7462628079 100644 --- a/build.gradle +++ b/build.gradle @@ -121,7 +121,7 @@ configure(javaprojects) { junitVersion = '4.8.2' log4jVersion = '1.2.12' mockitoVersion = '1.8.4' - springVersion = '3.1.0.M2' + springVersion = '3.0.5.RELEASE' springAmqpVersion = '1.0.0.RC3' springDataMongoVersion = '1.0.0.BUILD-SNAPSHOT' springDataCommonsVersion = '1.2.0.BUILD-SNAPSHOT' diff --git a/spring-integration-amqp/pom.xml b/spring-integration-amqp/pom.xml index 9683468b01..06f144241a 100644 --- a/spring-integration-amqp/pom.xml +++ b/spring-integration-amqp/pom.xml @@ -101,9 +101,9 @@ - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT + org.springframework + spring-context + 3.0.5.RELEASE compile @@ -112,12 +112,6 @@ 2.1.0.BUILD-SNAPSHOT test - - org.springframework - spring-context - 3.1.0.M2 - compile - cglib cglib-nodep @@ -142,18 +136,6 @@ 2.3 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework - spring-test - 3.1.0.M2 - test - org.springframework.amqp spring-rabbit @@ -186,6 +168,24 @@ + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework + spring-tx + 3.0.5.RELEASE + compile + + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -199,9 +199,9 @@ test - org.springframework - spring-tx - 3.1.0.M2 + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT compile diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml index 21eb396cd0..7925869cb8 100644 --- a/spring-integration-core/pom.xml +++ b/spring-integration-core/pom.xml @@ -103,7 +103,7 @@ org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -133,7 +133,7 @@ org.springframework spring-aop - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -144,9 +144,10 @@ org.springframework - spring-test - 3.1.0.M2 - test + spring-tx + 3.0.5.RELEASE + compile + true org.codehaus.jackson @@ -155,6 +156,12 @@ compile true + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -167,13 +174,6 @@ 1.8.4 test - - org.springframework - spring-tx - 3.1.0.M2 - compile - true - org.aspectj aspectjrt diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java index 93b7075861..49b1ce36a9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageDeliveryException; @@ -194,7 +194,7 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler { protected ConversionService getRequiredConversionService() { if (this.getConversionService() == null) { - this.setConversionService(new DefaultConversionService()); + this.setConversionService(ConversionServiceFactory.createDefaultConversionService()); } return this.getConversionService(); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java index cb4f3c336f..4c504cff5f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MapToObjectTransformer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -22,7 +22,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.validation.DataBinder; @@ -73,7 +73,7 @@ public class MapToObjectTransformer extends AbstractPayloadTransformer, conversionService = ((ConfigurableBeanFactory)this.getBeanFactory()).getConversionService(); } if (conversionService == null){ - conversionService = new DefaultConversionService(); + conversionService = ConversionServiceFactory.createDefaultConversionService(); } binder.setConversionService(conversionService); binder.bind(new MutablePropertyValues(payload)); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java index 152b4e6774..59f08cdcb0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -25,7 +25,7 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.expression.TypeConverter; /** @@ -45,7 +45,7 @@ public class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware public BeanFactoryTypeConverter() { synchronized (BeanFactoryTypeConverter.class) { if (defaultConversionService == null) { - defaultConversionService = new DefaultConversionService(); + defaultConversionService = ConversionServiceFactory.createDefaultConversionService(); } } this.conversionService = defaultConversionService; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java index f2f83b3f2c..9d5b9ff1a6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -30,7 +30,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.aop.framework.ProxyFactory; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.Message; import org.springframework.integration.annotation.Aggregator; @@ -240,7 +240,7 @@ public class MethodInvokingMessageGroupProcessorTests { } MethodInvokingMessageGroupProcessor processor = new MethodInvokingMessageGroupProcessor(new SimpleAggregator()); - GenericConversionService conversionService = new DefaultConversionService(); + GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); conversionService.addConverter(new Converter, Iterator>() { public Iterator convert(ArrayList source) { return source.iterator(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java index 05689ee50b..334d101a78 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -25,7 +25,7 @@ import org.springframework.context.support.ConversionServiceFactoryBean; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageDeliveryException; @@ -59,7 +59,7 @@ public class DatatypeChannelTests { @Test public void unsupportedTypeButConversionServiceSupports() { QueueChannel channel = createChannel(Integer.class); - ConversionService conversionService = new DefaultConversionService(); + ConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); channel.setConversionService(conversionService); assertTrue(channel.send(new GenericMessage("123"))); } @@ -67,7 +67,7 @@ public class DatatypeChannelTests { @Test(expected = MessageDeliveryException.class) public void unsupportedTypeAndConversionServiceDoesNotSupport() { QueueChannel channel = createChannel(Integer.class); - ConversionService conversionService = new DefaultConversionService(); + ConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); channel.setConversionService(conversionService); assertTrue(channel.send(new GenericMessage(Boolean.TRUE))); } @@ -75,7 +75,7 @@ public class DatatypeChannelTests { @Test public void unsupportedTypeButCustomConversionServiceSupports() { QueueChannel channel = createChannel(Integer.class); - GenericConversionService conversionService = new DefaultConversionService(); + GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); conversionService.addConverter(new Converter() { public Integer convert(Boolean source) { return source ? 1 : 0; @@ -115,7 +115,7 @@ public class DatatypeChannelTests { return source ? 1 : 0; } }; - GenericConversionService customConversionService = new DefaultConversionService(); + GenericConversionService customConversionService = ConversionServiceFactory.createDefaultConversionService(); customConversionService.addConverter(new Converter() { public Integer convert(Boolean source) { return source ? 99 : -99; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java index b1ff7fc770..51f92ed852 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -25,11 +25,12 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.mockito.Mockito; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; @@ -69,7 +70,7 @@ public class GatewayProxyFactoryBeanTests { public void testRequestReplyWithAnonymousChannelConvertedTypeViaConversionService() throws Exception { QueueChannel requestChannel = new QueueChannel(); startResponder(requestChannel); - GenericConversionService cs = new DefaultConversionService(); + GenericConversionService cs = ConversionServiceFactory.createDefaultConversionService(); Converter stringToByteConverter = new Converter() { public byte[] convert(String source) { return source.getBytes(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java index 4550cad1f3..f02af338d4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -20,11 +20,12 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; + import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; @@ -113,7 +114,7 @@ public class MapToObjectTransformerTests { private ConfigurableBeanFactory getBeanFactory(){ DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - GenericConversionService conversionService = new DefaultConversionService(); + GenericConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); beanFactory.setConversionService(conversionService); return beanFactory; } diff --git a/spring-integration-event/pom.xml b/spring-integration-event/pom.xml index dcf5f12f79..465115cd36 100644 --- a/spring-integration-event/pom.xml +++ b/spring-integration-event/pom.xml @@ -107,10 +107,10 @@ test - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.easymock + easymockclassextension + 2.3 + test org.springframework.integration @@ -118,22 +118,10 @@ 2.1.0.BUILD-SNAPSHOT test - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework - spring-test - 3.1.0.M2 - test - org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -142,12 +130,24 @@ 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-feed/pom.xml b/spring-integration-feed/pom.xml index 81d81f47d5..49a4558cd9 100644 --- a/spring-integration-feed/pom.xml +++ b/spring-integration-feed/pom.xml @@ -103,7 +103,7 @@ org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -130,18 +130,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymock @@ -154,10 +142,16 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.springframework spring-test - 3.1.0.M2 + 3.0.5.RELEASE test @@ -172,6 +166,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + net.java.dev.rome rome diff --git a/spring-integration-file/pom.xml b/spring-integration-file/pom.xml index 8be171db85..8f3ae3d163 100644 --- a/spring-integration-file/pom.xml +++ b/spring-integration-file/pom.xml @@ -107,10 +107,10 @@ test - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.easymock + easymockclassextension + 2.3 + test org.springframework.integration @@ -118,22 +118,10 @@ 2.1.0.BUILD-SNAPSHOT test - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework - spring-test - 3.1.0.M2 - test - org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -142,12 +130,24 @@ 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml index 1f1a2dd97a..149a276f95 100644 --- a/spring-integration-ftp/pom.xml +++ b/spring-integration-ftp/pom.xml @@ -112,18 +112,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - commons-net commons-net @@ -143,17 +131,11 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - - org.springframework - spring-context-support - 3.1.0.M2 - compile - javax.activation activation @@ -161,6 +143,12 @@ compile true + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -173,6 +161,18 @@ 1.8.4 test + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + + + org.springframework + spring-context-support + 3.0.5.RELEASE + compile + junit junit-dep diff --git a/spring-integration-gemfire/pom.xml b/spring-integration-gemfire/pom.xml index 8f4bb8ae30..ae87fa2f89 100644 --- a/spring-integration-gemfire/pom.xml +++ b/spring-integration-gemfire/pom.xml @@ -104,18 +104,36 @@ + + org.springframework + spring-context + 3.0.5.RELEASE + compile + + + org.springframework.integration + spring-integration-stream + 2.1.0.BUILD-SNAPSHOT + test + + + cglib + cglib-nodep + 2.2 + test + + + log4j + log4j + 1.2.12 + test + org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension @@ -123,22 +141,16 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - - org.springframework.data.gemfire - spring-gemfire - 1.0.1.RELEASE - compile - org.springframework - spring-context - 3.1.0.M2 - compile + spring-test + 3.0.5.RELEASE + test org.hamcrest @@ -154,21 +166,15 @@ org.springframework.integration - spring-integration-stream + spring-integration-core 2.1.0.BUILD-SNAPSHOT - test + compile - log4j - log4j - 1.2.12 - test - - - cglib - cglib-nodep - 2.2 - test + org.springframework.data.gemfire + spring-gemfire + 1.1.0.BUILD-SNAPSHOT + compile junit diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest-context.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest-context.xml index 68e9974f8c..d2601f2e5d 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest-context.xml +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest-context.xml @@ -9,6 +9,8 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + + diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest.java index 5a4c782e5e..1ba91b5ae4 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest.java @@ -1,3 +1,19 @@ +/* + * Copyright 2002-2011 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.integration.gemfire.store.messagegroupstore; import static org.junit.Assert.assertEquals; @@ -11,7 +27,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; /** * Tests the Gemfire @@ -28,7 +43,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; * @author Josh Long */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = { GemfireMessageGroupStoreTestConfiguration.class }) +@ContextConfiguration public class GemfireMessageGroupStoreTest { @Autowired diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTestConfiguration.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTestConfiguration.java index 8c24291782..43602cbd10 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTestConfiguration.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTestConfiguration.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.SmartLifecycle; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportResource; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.RegionFactoryBean; import org.springframework.integration.Message; @@ -58,7 +57,6 @@ import com.gemstone.gemfire.cache.Region; * @since 2.1 */ @Configuration -@ImportResource("org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageGroupStoreTest-context.xml") public class GemfireMessageGroupStoreTestConfiguration { public static List LIST_OF_STRINGS = Arrays.asList("1,2,3,4,5".split(",")); diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageStore-context.xml b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageStore-context.xml index 5359683ada..b1e58e2894 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageStore-context.xml +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/messagegroupstore/GemfireMessageStore-context.xml @@ -22,7 +22,6 @@ - diff --git a/spring-integration-groovy/pom.xml b/spring-integration-groovy/pom.xml index 2ff9b9bc67..95570dfc73 100644 --- a/spring-integration-groovy/pom.xml +++ b/spring-integration-groovy/pom.xml @@ -106,12 +106,6 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension @@ -119,21 +113,15 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.hamcrest + hamcrest-all + 1.1 test org.springframework - spring-context-support - 3.1.0.M2 - compile - - - org.hamcrest - hamcrest-all - 1.1 + spring-test + 3.0.5.RELEASE test @@ -148,6 +136,18 @@ 1.8.4 test + + org.springframework + spring-context-support + 3.0.5.RELEASE + compile + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-http/pom.xml b/spring-integration-http/pom.xml index 940cc25f39..4d66494472 100644 --- a/spring-integration-http/pom.xml +++ b/spring-integration-http/pom.xml @@ -100,6 +100,12 @@ + + org.springframework + spring-webmvc + 3.0.5.RELEASE + compile + javax.servlet servlet-api @@ -118,24 +124,6 @@ 1.2.12 test - - org.springframework - spring-webmvc - 3.1.0.M2 - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymock @@ -161,10 +149,16 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.springframework spring-test - 3.1.0.M2 + 3.0.5.RELEASE test @@ -179,6 +173,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index df47123b4c..fd514a0099 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; -import org.springframework.core.convert.support.DefaultConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.GenericConversionService; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -178,7 +178,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { HttpHeaders headers = new HttpHeaders(); mapper.fromHeaders(new MessageHeaders(messageHeaders), headers); - assertEquals("\"1234\"", headers.getETag()); + assertEquals("1234", headers.getETag()); } // Expires tests @@ -460,7 +460,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateCustomHeadersWithNonStringValuesAndDefaultConverterOnly() throws Exception{ DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] {"customHeader*"}); - ConversionService cs = new DefaultConversionService(); + ConversionService cs = ConversionServiceFactory.createDefaultConversionService(); DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); beanFactory.registerSingleton("integrationConversionService", cs); mapper.setBeanFactory(beanFactory); @@ -481,7 +481,7 @@ public class DefaultHttpHeaderMapperFromMessageInboundTests { public void validateCustomHeadersWithNonStringValuesAndDefaultConverterWithCustomConverter() throws Exception{ DefaultHttpHeaderMapper mapper = new DefaultHttpHeaderMapper(); mapper.setOutboundHeaderNames(new String[] {"customHeader*"}); - GenericConversionService cs = new DefaultConversionService(); + GenericConversionService cs = ConversionServiceFactory.createDefaultConversionService(); cs.addConverter(new TestClassConverter()); DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); beanFactory.registerSingleton("integrationConversionService", cs); diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml index d5545cf133..498962880d 100644 --- a/spring-integration-ip/pom.xml +++ b/spring-integration-ip/pom.xml @@ -107,10 +107,10 @@ test - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.easymock + easymockclassextension + 2.3 + test org.springframework.integration @@ -118,22 +118,10 @@ 2.1.0.BUILD-SNAPSHOT test - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework - spring-test - 3.1.0.M2 - test - org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -142,6 +130,12 @@ 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.mockito mockito-all @@ -154,6 +148,12 @@ 2.1.0.BUILD-SNAPSHOT runtime + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index caa737a5cd..211cee341f 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -107,13 +107,13 @@ org.springframework spring-jdbc - 3.1.0.M2 + 3.0.5.RELEASE compile org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -147,14 +147,20 @@ test - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT + org.easymock + easymock + 2.3 + test + + + org.springframework + spring-aop + 3.0.5.RELEASE compile org.easymock - easymock + easymockclassextension 2.3 test @@ -166,28 +172,22 @@ org.springframework - spring-aop - 3.1.0.M2 + spring-tx + 3.0.5.RELEASE compile - - org.easymock - easymockclassextension - 2.3 - test - - - org.springframework - spring-test - 3.1.0.M2 - test - org.hamcrest hamcrest-all 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + hsqldb hsqldb @@ -201,9 +201,9 @@ test - org.springframework - spring-tx - 3.1.0.M2 + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT compile diff --git a/spring-integration-jms/pom.xml b/spring-integration-jms/pom.xml index 83b0164865..e5ff07b9f2 100644 --- a/spring-integration-jms/pom.xml +++ b/spring-integration-jms/pom.xml @@ -106,10 +106,22 @@ 5.3.0 test + + org.springframework + spring-jms + 3.0.5.RELEASE + compile + + + org.springframework + spring-oxm + 3.0.5.RELEASE + test + org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -130,46 +142,34 @@ 1.2.12 test - - org.springframework - spring-jms - 3.1.0.M2 - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework - spring-oxm - 3.1.0.M2 - test - org.easymock easymockclassextension 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + + + org.springframework + spring-tx + 3.0.5.RELEASE + compile + org.springframework spring-test - 3.1.0.M2 + 3.0.5.RELEASE test @@ -185,9 +185,9 @@ test - org.springframework - spring-tx - 3.1.0.M2 + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT compile diff --git a/spring-integration-jmx/pom.xml b/spring-integration-jmx/pom.xml index ecafc1e209..ee88754464 100644 --- a/spring-integration-jmx/pom.xml +++ b/spring-integration-jmx/pom.xml @@ -103,7 +103,7 @@ org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -124,18 +124,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymock @@ -148,10 +136,16 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.springframework spring-test - 3.1.0.M2 + 3.0.5.RELEASE test @@ -166,6 +160,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + org.aspectj aspectjrt diff --git a/spring-integration-mail/pom.xml b/spring-integration-mail/pom.xml index 95991f53f4..ec72bb7b82 100644 --- a/spring-integration-mail/pom.xml +++ b/spring-integration-mail/pom.xml @@ -112,18 +112,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymock @@ -137,17 +125,11 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - - org.springframework - spring-context-support - 3.1.0.M2 - compile - javax.activation activation @@ -155,6 +137,12 @@ compile true + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -167,6 +155,18 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + + + org.springframework + spring-context-support + 3.0.5.RELEASE + compile + javax.mail mail diff --git a/spring-integration-mongodb/pom.xml b/spring-integration-mongodb/pom.xml index 54a9c9c579..52214a2bfe 100644 --- a/spring-integration-mongodb/pom.xml +++ b/spring-integration-mongodb/pom.xml @@ -107,15 +107,15 @@ compile - org.springframework.data - spring-data-mongodb - 1.0.0.BUILD-SNAPSHOT + org.springframework + spring-context + 3.0.5.RELEASE compile - org.springframework - spring-context - 3.1.0.M2 + org.springframework.data + spring-data-mongodb + 1.0.0.BUILD-SNAPSHOT compile @@ -130,18 +130,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymock @@ -154,10 +142,16 @@ 2.3 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + org.springframework spring-test - 3.1.0.M2 + 3.0.5.RELEASE test @@ -172,6 +166,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-redis/pom.xml b/spring-integration-redis/pom.xml index d159420436..279f4820bb 100644 --- a/spring-integration-redis/pom.xml +++ b/spring-integration-redis/pom.xml @@ -116,6 +116,12 @@ + + org.springframework + spring-context + 3.0.5.RELEASE + compile + org.springframework.data spring-data-redis @@ -132,12 +138,6 @@ - - org.springframework - spring-context - 3.1.0.M2 - compile - org.springframework spring-dao @@ -162,24 +162,12 @@ 2.2 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension @@ -187,9 +175,9 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test @@ -198,6 +186,12 @@ 1.8.3 compile + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -210,6 +204,12 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-rmi/pom.xml b/spring-integration-rmi/pom.xml index 6e6ddd11ee..ef59db944c 100644 --- a/spring-integration-rmi/pom.xml +++ b/spring-integration-rmi/pom.xml @@ -106,22 +106,10 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.springframework spring-aop - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -131,15 +119,15 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -148,12 +136,24 @@ 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-scripting/pom.xml b/spring-integration-scripting/pom.xml index 04a6c65120..3b456f755d 100644 --- a/spring-integration-scripting/pom.xml +++ b/spring-integration-scripting/pom.xml @@ -107,10 +107,10 @@ test - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile + org.easymock + easymockclassextension + 2.3 + test org.springframework.integration @@ -119,21 +119,15 @@ test - org.easymock - easymockclassextension - 2.3 + org.hamcrest + hamcrest-all + 1.1 test org.springframework spring-test - 3.1.0.M2 - test - - - org.hamcrest - hamcrest-all - 1.1 + 3.0.5.RELEASE test @@ -148,6 +142,12 @@ 1.7.5 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-security/pom.xml b/spring-integration-security/pom.xml index 93092cef91..8b4d071e94 100644 --- a/spring-integration-security/pom.xml +++ b/spring-integration-security/pom.xml @@ -130,16 +130,10 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.springframework spring-aop - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -148,10 +142,16 @@ 2.3 test + + org.springframework + spring-tx + 3.0.5.RELEASE + compile + org.springframework spring-test - 3.1.0.M2 + 3.0.5.RELEASE test @@ -179,9 +179,9 @@ - org.springframework - spring-tx - 3.1.0.M2 + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT compile diff --git a/spring-integration-sftp/pom.xml b/spring-integration-sftp/pom.xml index 8bb3e7bc63..f0a03d2c78 100644 --- a/spring-integration-sftp/pom.xml +++ b/spring-integration-sftp/pom.xml @@ -124,30 +124,12 @@ 2.2 test - - org.springframework.integration - spring-integration-file - 2.1.0.BUILD-SNAPSHOT - compile - - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension @@ -155,17 +137,11 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - - org.springframework - spring-context-support - 3.1.0.M2 - compile - javax.activation activation @@ -173,6 +149,12 @@ compile true + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -185,6 +167,24 @@ 1.8.4 test + + org.springframework.integration + spring-integration-file + 2.1.0.BUILD-SNAPSHOT + compile + + + org.springframework + spring-context-support + 3.0.5.RELEASE + compile + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-stream/pom.xml b/spring-integration-stream/pom.xml index c9d9b75b5f..9d82d5cb4f 100644 --- a/spring-integration-stream/pom.xml +++ b/spring-integration-stream/pom.xml @@ -106,28 +106,16 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension 2.3 test - - org.springframework - spring-test - 3.1.0.M2 - test - org.springframework spring-context - 3.1.0.M2 + 3.0.5.RELEASE compile @@ -136,12 +124,24 @@ 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-test/pom.xml b/spring-integration-test/pom.xml index cc02d67600..31ed29ab1f 100644 --- a/spring-integration-test/pom.xml +++ b/spring-integration-test/pom.xml @@ -106,12 +106,6 @@ 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension @@ -120,14 +114,14 @@ org.springframework - spring-test - 3.1.0.M2 - test + spring-context + 3.0.5.RELEASE + compile org.springframework - spring-context - 3.1.0.M2 + spring-test + 3.0.5.RELEASE compile @@ -142,6 +136,12 @@ 1.8.4 compile + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + log4j log4j diff --git a/spring-integration-twitter/pom.xml b/spring-integration-twitter/pom.xml index 333c1d0f1a..676954c2d2 100644 --- a/spring-integration-twitter/pom.xml +++ b/spring-integration-twitter/pom.xml @@ -118,18 +118,6 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymock @@ -143,17 +131,11 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test - - org.springframework - spring-context-support - 3.1.0.M2 - compile - javax.activation activation @@ -161,6 +143,12 @@ compile true + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -173,6 +161,18 @@ 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + + + org.springframework + spring-context-support + 3.0.5.RELEASE + compile + junit junit-dep diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml index 609ff92532..e66121f402 100644 --- a/spring-integration-ws/pom.xml +++ b/spring-integration-ws/pom.xml @@ -100,6 +100,12 @@ + + org.springframework + spring-expression + 3.0.5.RELEASE + compile + com.sun.xml.messaging.saaj saaj-impl @@ -107,18 +113,18 @@ compile true + + org.springframework + spring-oxm + 3.0.5.RELEASE + compile + log4j log4j 1.2.12 test - - org.springframework - spring-expression - 3.1.0.M2 - compile - org.springframework.ws spring-ws-core @@ -158,36 +164,18 @@ true - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension 2.3 test - - org.springframework - spring-oxm - 3.1.0.M2 - compile - stax stax-api @@ -195,9 +183,9 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test @@ -213,12 +201,24 @@ 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml index 1f072724bd..695173b6e2 100644 --- a/spring-integration-xml/pom.xml +++ b/spring-integration-xml/pom.xml @@ -100,6 +100,18 @@ + + org.springframework + spring-context + 3.0.5.RELEASE + compile + + + org.springframework + spring-oxm + 3.0.5.RELEASE + compile + org.springframework.ws spring-xml @@ -122,12 +134,6 @@ 1.2 test - - org.springframework - spring-context - 3.1.0.M2 - compile - javax.xml jaxb-impl @@ -152,48 +158,30 @@ 2.0EA3 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension 2.3 test - - org.springframework - spring-oxm - 3.1.0.M2 - compile - - - org.springframework - spring-test - 3.1.0.M2 - test - stax stax-api 1.0.1 test + + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT + test + javax.activation activation @@ -207,12 +195,24 @@ 1.1 test + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.mockito mockito-all 1.8.4 test + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java index 71bead6d25..715db852cd 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathExpressionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2010 the original author or authors. + * Copyright 2002-2011 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. @@ -19,18 +19,18 @@ package org.springframework.integration.xml.config; import java.util.HashMap; import java.util.Map; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.BeanDefinitionParserDelegate; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.core.env.StandardEnvironment; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.xml.xpath.XPathExpressionFactory; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * Parser for the <xpath-expression> element. @@ -99,8 +99,8 @@ public class XPathExpressionParser extends AbstractSingleBeanDefinitionParser { } protected Map parseNamespaceMapElement(Element element, ParserContext parserContext, BeanDefinition parentDefinition) { - BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext(), new StandardEnvironment()); - beanParser.initDefaults(element.getOwnerDocument().getDocumentElement(), beanParser); + BeanDefinitionParserDelegate beanParser = new BeanDefinitionParserDelegate(parserContext.getReaderContext()); + beanParser.initDefaults(element.getOwnerDocument().getDocumentElement()); return beanParser.parseMapElement(element, parentDefinition); } diff --git a/spring-integration-xmpp/pom.xml b/spring-integration-xmpp/pom.xml index 0740d3a629..4b67f27bbf 100644 --- a/spring-integration-xmpp/pom.xml +++ b/spring-integration-xmpp/pom.xml @@ -118,24 +118,12 @@ 1.2.12 test - - org.springframework.integration - spring-integration-test - 2.1.0.BUILD-SNAPSHOT - test - org.easymock easymock 2.3 test - - org.springframework.integration - spring-integration-core - 2.1.0.BUILD-SNAPSHOT - compile - org.easymock easymockclassextension @@ -143,9 +131,9 @@ test - org.springframework - spring-test - 3.1.0.M2 + org.springframework.integration + spring-integration-test + 2.1.0.BUILD-SNAPSHOT test @@ -161,18 +149,18 @@ 3.1.0 compile - - org.springframework - spring-context-support - 3.1.0.M2 - compile - jivesoftware smackx 3.1.0 compile + + org.springframework + spring-test + 3.0.5.RELEASE + test + org.hamcrest hamcrest-all @@ -185,6 +173,18 @@ 1.8.4 test + + org.springframework + spring-context-support + 3.0.5.RELEASE + compile + + + org.springframework.integration + spring-integration-core + 2.1.0.BUILD-SNAPSHOT + compile + junit junit-dep