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)

This commit is contained in:
Mark Fisher
2010-10-22 21:12:06 -05:00
parent f51a9a10d7
commit 180753ca5b
27 changed files with 49 additions and 74 deletions

View File

@@ -30,11 +30,6 @@
<artifactId>spring-tx</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.commons</groupId>
<artifactId>spring-commons-serializer</artifactId>
<optional>true</optional>
</dependency>
<!-- test-scoped dependencies -->
<dependency>
<groupId>junit</groupId>

View File

@@ -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

View File

@@ -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

View File

@@ -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;

View File

@@ -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;

View File

@@ -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,