From 180753ca5b6a9fbe965aaa142243b35b83cb5bad Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Fri, 22 Oct 2010 21:12:06 -0500 Subject: [PATCH] INT-1487 now using Spring 3.0.5 core Serializer/Deserializer, INT-1490 import version is now resolved since it's included in 'core' import, and INT-1526 updated the affected template.mf files for 3.0.5 as the minimum (will address others next) --- spring-integration-core/pom.xml | 5 ----- .../transformer/PayloadDeserializingTransformer.java | 4 ++-- .../transformer/PayloadSerializingTransformer.java | 4 ++-- .../PayloadDeserializingTransformerParserTests.java | 2 +- .../xml/PayloadSerializingTransformerParserTests.java | 3 +-- spring-integration-core/template.mf | 5 ++--- spring-integration-ip/pom.xml | 4 ---- .../ip/tcp/connection/AbstractConnectionFactory.java | 4 ++-- .../ip/tcp/connection/AbstractTcpConnection.java | 4 ++-- .../connection/AbstractTcpConnectionInterceptor.java | 4 ++-- .../integration/ip/tcp/connection/TcpConnection.java | 4 ++-- .../ip/tcp/connection/TcpNetConnection.java | 2 +- .../tcp/serializer/AbstractByteArraySerializer.java | 5 ++--- .../integration/ip/config/ParserUnitTests.java | 4 ++-- .../integration/ip/tcp/TcpOutboundGatewayTests.java | 4 ++-- .../ip/tcp/TcpReceivingChannelAdapterTests.java | 4 ++-- .../ip/tcp/TcpSendingMessageHandlerTests.java | 4 ++-- .../ip/tcp/serializer/DeserializationTests.java | 5 +---- .../ip/tcp/serializer/SerializationTests.java | 5 +---- .../integration/ip/util/SocketUtils.java | 2 ++ spring-integration-ip/template.mf | 11 +++++------ spring-integration-jdbc/pom.xml | 4 ---- .../integration/jdbc/JdbcMessageStore.java | 9 +++++---- .../integration/jdbc/JdbcMessageStoreTests.java | 5 +++-- .../jdbc/config/JdbcMessageStoreParserTests.java | 8 ++++---- spring-integration-jdbc/template.mf | 3 +-- spring-integration-parent/pom.xml | 5 ----- 27 files changed, 49 insertions(+), 74 deletions(-) diff --git a/spring-integration-core/pom.xml b/spring-integration-core/pom.xml index 62ae5a8e8f..f42fe281a7 100644 --- a/spring-integration-core/pom.xml +++ b/spring-integration-core/pom.xml @@ -30,11 +30,6 @@ spring-tx true - - org.springframework.commons - spring-commons-serializer - true - junit diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java index 006564ed02..c1165d87e6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadDeserializingTransformer.java @@ -16,8 +16,8 @@ package org.springframework.integration.transformer; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.DeserializingConverter; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.support.DeserializingConverter; /** * Transformer that deserializes the inbound byte array payload to an object by delegating to a diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java index 2704842720..63e10b9b03 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/PayloadSerializingTransformer.java @@ -16,8 +16,8 @@ package org.springframework.integration.transformer; -import org.springframework.commons.serializer.Serializer; -import org.springframework.commons.serializer.SerializingConverter; +import org.springframework.core.serializer.Serializer; +import org.springframework.core.serializer.support.SerializingConverter; /** * Transformer that serializes the inbound payload into a byte array by delegating to a diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java index 165a6a7096..28581abcb4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.commons.serializer.Deserializer; +import org.springframework.core.serializer.Deserializer; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.core.PollableChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java index a79fc69d4f..08b016e3e0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java @@ -28,9 +28,8 @@ import java.io.Serializable; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.commons.serializer.Serializer; +import org.springframework.core.serializer.Serializer; import org.springframework.integration.Message; import org.springframework.integration.MessageChannel; import org.springframework.integration.core.PollableChannel; diff --git a/spring-integration-core/template.mf b/spring-integration-core/template.mf index e72f35ae1f..c60c374cc2 100644 --- a/spring-integration-core/template.mf +++ b/spring-integration-core/template.mf @@ -3,9 +3,8 @@ Bundle-Name: Spring Integration Core Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - org.springframework.commons.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.springframework.*;version="[3.0.3, 4.0.0)", - org.springframework.transaction;version="[3.0.3, 4.0.0)";resolution:=optional, + org.springframework.*;version="[3.0.5, 4.0.0)", + org.springframework.transaction;version="[3.0.5, 4.0.0)";resolution:=optional, org.apache.commons.logging;version="[1.1.1, 2.0.0)", org.aopalliance.*;version="[1.0.0, 2.0.0)", org.codehaus.jackson.*;version="[1.0.0, 2.0.0)";resolution:=optional, diff --git a/spring-integration-ip/pom.xml b/spring-integration-ip/pom.xml index d27670166f..5b182044d9 100644 --- a/spring-integration-ip/pom.xml +++ b/spring-integration-ip/pom.xml @@ -25,10 +25,6 @@ spring-integration-stream runtime - - org.springframework.commons - spring-commons-serializer - cglib diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java index d66727da1a..627243abb2 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java @@ -24,9 +24,9 @@ import java.util.concurrent.Executors; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; import org.springframework.context.SmartLifecycle; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; import org.springframework.util.Assert; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java index f9b2580dcb..10496fe9e0 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnection.java @@ -21,8 +21,8 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; import org.springframework.integration.ip.tcp.serializer.AbstractByteArraySerializer; import org.springframework.util.Assert; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionInterceptor.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionInterceptor.java index 81ef26ac74..bbbadc186a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionInterceptor.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractTcpConnectionInterceptor.java @@ -16,8 +16,8 @@ package org.springframework.integration.ip.tcp.connection; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; import org.springframework.integration.Message; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java index f2ee28ade8..3fbfe27708 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java @@ -19,8 +19,8 @@ package org.springframework.integration.ip.tcp.connection; import java.net.Socket; import java.nio.channels.SocketChannel; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; import org.springframework.integration.Message; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java index c33deea6c3..4336771670 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java @@ -19,7 +19,7 @@ package org.springframework.integration.ip.tcp.connection; import java.net.Socket; import java.net.SocketTimeoutException; -import org.springframework.commons.serializer.Deserializer; +import org.springframework.core.serializer.Deserializer; import org.springframework.integration.Message; import org.springframework.integration.ip.tcp.SocketIoUtils; import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java index b94e3e00f5..749acb6bcd 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/serializer/AbstractByteArraySerializer.java @@ -20,9 +20,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; /** * Base class for (de)serializers that provide a mechanism to diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java index c8db3148e7..27ae58b088 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java @@ -28,9 +28,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; import org.springframework.context.ApplicationContext; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; import org.springframework.core.task.TaskExecutor; import org.springframework.integration.ip.tcp.TcpInboundGateway; import org.springframework.integration.ip.tcp.TcpOutboundGateway; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java index 7afab7bd62..6edfc2e4c7 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java @@ -38,8 +38,8 @@ import javax.net.ServerSocketFactory; import org.junit.Test; -import org.springframework.commons.serializer.DefaultDeserializer; -import org.springframework.commons.serializer.DefaultSerializer; +import org.springframework.core.serializer.DefaultDeserializer; +import org.springframework.core.serializer.DefaultSerializer; import org.springframework.integration.Message; import org.springframework.integration.MessageTimeoutException; import org.springframework.integration.channel.QueueChannel; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java index 22d42e2b48..5fbb86f473 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java @@ -37,8 +37,8 @@ import javax.net.SocketFactory; import org.junit.Test; -import org.springframework.commons.serializer.DefaultDeserializer; -import org.springframework.commons.serializer.DefaultSerializer; +import org.springframework.core.serializer.DefaultDeserializer; +import org.springframework.core.serializer.DefaultSerializer; import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java index 072d3cbc4a..a3dff9e1d0 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java @@ -40,8 +40,8 @@ import javax.net.ServerSocketFactory; import org.junit.Test; -import org.springframework.commons.serializer.DefaultDeserializer; -import org.springframework.commons.serializer.DefaultSerializer; +import org.springframework.core.serializer.DefaultDeserializer; +import org.springframework.core.serializer.DefaultSerializer; import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java index 2f3a73c882..f897269807 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/DeserializationTests.java @@ -27,10 +27,7 @@ import javax.net.ServerSocketFactory; import org.junit.Test; -import org.springframework.commons.serializer.DefaultDeserializer; -import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; -import org.springframework.integration.ip.tcp.serializer.ByteArrayLengthHeaderSerializer; -import org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer; +import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.integration.ip.util.SocketUtils; /** diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java index 084fabfa0a..9fd59e6ffc 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/serializer/SerializationTests.java @@ -30,10 +30,7 @@ import javax.net.SocketFactory; import org.junit.Test; -import org.springframework.commons.serializer.DefaultSerializer; -import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; -import org.springframework.integration.ip.tcp.serializer.ByteArrayLengthHeaderSerializer; -import org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer; +import org.springframework.core.serializer.DefaultSerializer; import org.springframework.integration.ip.util.SocketUtils; /** diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java index 92b5e9bb35..52327ae65e 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/SocketUtils.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.integration.ip.util; import java.io.ObjectOutputStream; @@ -29,6 +30,7 @@ import javax.net.ServerSocketFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.springframework.integration.ip.AbstractInternetProtocolReceivingChannelAdapter; /** diff --git a/spring-integration-ip/template.mf b/spring-integration-ip/template.mf index 28637b16c2..9dadb2a10d 100644 --- a/spring-integration-ip/template.mf +++ b/spring-integration-ip/template.mf @@ -4,12 +4,11 @@ Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: org.apache.commons.logging;version="[1.1.1, 2.0.0)", - org.springframework.commons.*;version="[1.0.0, 2.0.0)", org.springframework.integration.*;version="[2.0.0, 2.0.1)", - org.springframework.beans.*;version="[3.0.3, 4.0.0)", - org.springframework.context;version="[3.0.3, 4.0.0)", - org.springframework.core.*;version="[3.0.3, 4.0.0)", - org.springframework.scheduling.*;version="[3.0.3, 4.0.0)", - org.springframework.util;version="[3.0.3, 4.0.0)", + org.springframework.beans.*;version="[3.0.5, 4.0.0)", + org.springframework.context;version="[3.0.5, 4.0.0)", + org.springframework.core.*;version="[3.0.5, 4.0.0)", + org.springframework.scheduling.*;version="[3.0.5, 4.0.0)", + org.springframework.util;version="[3.0.5, 4.0.0)", org.w3c.dom.*;version="0", javax.net.*;version="0" diff --git a/spring-integration-jdbc/pom.xml b/spring-integration-jdbc/pom.xml index 8591cf4ff8..f813725cb1 100644 --- a/spring-integration-jdbc/pom.xml +++ b/spring-integration-jdbc/pom.xml @@ -31,10 +31,6 @@ org.springframework.integration spring-integration-core - - org.springframework.commons - spring-commons-serializer - cglib diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java index 2ba48e9181..71b4577817 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java @@ -29,10 +29,11 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.DeserializingConverter; -import org.springframework.commons.serializer.Serializer; -import org.springframework.commons.serializer.SerializingConverter; + +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; +import org.springframework.core.serializer.support.DeserializingConverter; +import org.springframework.core.serializer.support.SerializingConverter; import org.springframework.integration.Message; import org.springframework.integration.store.AbstractMessageGroupStore; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java index 558513cc37..7bac021445 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java @@ -37,9 +37,10 @@ import javax.sql.DataSource; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; import org.springframework.integration.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java index e683f87892..3f557fc9e2 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java @@ -10,11 +10,11 @@ import java.io.OutputStream; import org.junit.After; import org.junit.Test; -import org.springframework.commons.serializer.DefaultDeserializer; -import org.springframework.commons.serializer.DefaultSerializer; -import org.springframework.commons.serializer.Deserializer; -import org.springframework.commons.serializer.Serializer; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.core.serializer.DefaultDeserializer; +import org.springframework.core.serializer.DefaultSerializer; +import org.springframework.core.serializer.Deserializer; +import org.springframework.core.serializer.Serializer; import org.springframework.integration.Message; import org.springframework.integration.jdbc.JdbcMessageStore; import org.springframework.integration.store.MessageStore; diff --git a/spring-integration-jdbc/template.mf b/spring-integration-jdbc/template.mf index 0b26fd55c4..b96f483bf5 100644 --- a/spring-integration-jdbc/template.mf +++ b/spring-integration-jdbc/template.mf @@ -3,9 +3,8 @@ Bundle-Name: Spring Integration JDBC Support Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2 Import-Template: - org.springframework.commons.*;version="[1.0.0, 2.0.0)", org.springframework.integration.*;version="[2.0.0, 2.0.1)", - org.springframework.*;version="[3.0.3, 4.0.0)", + org.springframework.*;version="[3.0.5, 4.0.0)", org.apache.commons.logging;version="[1.1.1, 2.0.0)", org.aopalliance.*;version="[1.0.0, 2.0.0)", javax.sql.*;version="0", diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml index 0db6e1babf..01e742cae6 100644 --- a/spring-integration-parent/pom.xml +++ b/spring-integration-parent/pom.xml @@ -206,11 +206,6 @@ spring-integration-stream ${project.version} - - org.springframework.commons - spring-commons-serializer - 1.0.0.BUILD-SNAPSHOT - org.springframework.security spring-security-core