diff --git a/pom.xml b/pom.xml index ced9c50b8..60117e620 100644 --- a/pom.xml +++ b/pom.xml @@ -183,20 +183,6 @@ test - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - test - - - - org.codehaus.jackson - jackson-core-asl - 1.9.13 - test - - javax.el el-api diff --git a/spring-cql/pom.xml b/spring-cql/pom.xml index bca830045..b9602d377 100644 --- a/spring-cql/pom.xml +++ b/spring-cql/pom.xml @@ -63,16 +63,6 @@ provided true - - org.codehaus.jackson - jackson-mapper-asl - test - - - org.codehaus.jackson - jackson-core-asl - test - javax.el el-api diff --git a/spring-cql/template.mf b/spring-cql/template.mf deleted file mode 100644 index 2c2bb8c07..000000000 --- a/spring-cql/template.mf +++ /dev/null @@ -1,27 +0,0 @@ -Bundle-SymbolicName: org.springframework.cassandra -Bundle-Name: Spring Cassandra -Bundle-Vendor: Spring Data Cassandra Community -Bundle-ManifestVersion: 2 -Import-Package: - sun.reflect;version="0";resolution:=optional -Import-Template: - com.datastax.driver.core.*;resolution:="optional";version="[0.1.0, 1.0.0)", - com.google.common.*;resolution:="optional";version="[11.0.0, 20.0.0)", - javax.xml.transform.*;resolution:="optional";version="0", - org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", - org.codehaus.jackson.*;resolution:="optional";version="[1.6, 2.0.0)", - org.springframework.beans.*;version="[3.1.0, 4.0.0)", - org.springframework.cache.*;version="[3.1.0, 4.0.0)", - org.springframework.context.*;version="[3.1.0, 4.0.0)", - org.springframework.core.*;version="[3.1.0, 4.0.0)", - org.springframework.dao.*;version="[3.1.0, 4.0.0)", - org.springframework.scheduling.*;resolution:="optional";version="[3.1.0, 4.0.0)", - org.springframework.util.*;version="[3.1.0, 4.0.0)", - org.springframework.oxm.*;resolution:="optional";version="[3.1.0, 4.0.0)", - org.springframework.transaction.support.*;version="[3.1.0, 4.0.0)", - org.springframework.data.*;version="[1.5.0, 2.0.0)", - org.springframework.expression.*;version="[3.1.0, 4.0.0)", - org.springframework.cassandra.*;version="[1.0.0,2.0.0)", - org.slf4j.*;version="[1.5.0, 1.8.0)", - org.w3c.dom.*;version="0" diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml index 043986dad..3b8b7182a 100644 --- a/spring-data-cassandra/pom.xml +++ b/spring-data-cassandra/pom.xml @@ -112,24 +112,26 @@ cassandra-all - - org.codehaus.jackson - jackson-mapper-asl - test - - - - org.codehaus.jackson - jackson-core-asl - test - - javax.el el-api test + + com.fasterxml.jackson.core + jackson-core + ${jackson} + test + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson} + test + + javax.validation diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java index 0e6c8eddd..1cf453653 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java @@ -28,7 +28,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest; @@ -42,6 +41,7 @@ import org.springframework.util.StringUtils; import com.datastax.driver.core.Row; import com.datastax.driver.core.querybuilder.QueryBuilder; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Test suite for applying {@link CustomConversions} to {@link MappingCassandraConverter} and diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java index c5e9abc46..aaecf2796 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java @@ -29,7 +29,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.Before; import org.junit.Test; import org.springframework.cassandra.core.cql.CqlIdentifier; @@ -46,6 +45,7 @@ import com.datastax.driver.core.DataType.CollectionType; import com.datastax.driver.core.DataType.Name; import com.datastax.driver.core.UDTValue; import com.datastax.driver.core.UserType; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Unit tests for {@link BasicCassandraMappingContext} targeted on {@link CreateTableSpecification}. diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java index 36a0b9491..bd1ea663b 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collections; -import org.codehaus.jackson.map.ObjectMapper; import org.junit.Before; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cassandra.core.cql.CqlIdentifier; @@ -41,10 +40,11 @@ import com.datastax.driver.core.Cluster; import com.datastax.driver.core.Session; import com.datastax.driver.core.UDTValue; import com.datastax.driver.core.UserType; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Test support for query method parameter type conversion. - * + * * @author Mark Paluch */ abstract class ParameterConversionTestSupport extends AbstractSpringDataEmbeddedCassandraIntegrationTest { diff --git a/spring-data-cassandra/template.mf b/spring-data-cassandra/template.mf deleted file mode 100644 index 20364b5ed..000000000 --- a/spring-data-cassandra/template.mf +++ /dev/null @@ -1,32 +0,0 @@ -Bundle-SymbolicName: org.springframework.data.cassandra -Bundle-Name: Spring Data for Apache Cassandra -Bundle-Vendor: Spring Data for Apache Cassandra -Bundle-ManifestVersion: 2 -Excluded-Imports: - lombok.* -Import-Package: - sun.reflect;version="0";resolution:=optional -Import-Template: - com.datastax.driver.core.*;resolution:="optional";version="[0.1.0, 1.0.0)", - com.google.common.*;resolution:="optional";version="[11.0.0, 20.0.0)", - javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, - javax.xml.transform.*;resolution:="optional";version="0", - org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, - org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", - org.codehaus.jackson.*;resolution:="optional";version="[1.6, 2.0.0)", - org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}";resolution:=optional, - org.springframework.beans.*;version="[3.1.0, 4.0.0)", - org.springframework.cache.*;version="[3.1.0, 4.0.0)", - org.springframework.context.*;version="[3.1.0, 4.0.0)", - org.springframework.core.*;version="[3.1.0, 4.0.0)", - org.springframework.dao.*;version="[3.1.0, 4.0.0)", - org.springframework.scheduling.*;resolution:="optional";version="[3.1.0, 4.0.0)", - org.springframework.util.*;version="[3.1.0, 4.0.0)", - org.springframework.oxm.*;resolution:="optional";version="[3.1.0, 4.0.0)", - org.springframework.transaction.support.*;version="[3.1.0, 4.0.0)", - org.springframework.data.*;version="[1.5.0, 2.0.0)", - org.springframework.expression.*;version="[3.1.0, 4.0.0)", - org.springframework.cassandra.*;version="[1.0.0,2.0.0)", - org.threeten.bp.*;version="${threetenbp:[=.=.=,+1.0.0)}";resolution:=optional, - org.slf4j.*;version="[1.5.0, 1.8.0)", - org.w3c.dom.*;version="0" diff --git a/src/main/asciidoc/reference/cassandra.adoc b/src/main/asciidoc/reference/cassandra.adoc index d744cacb6..a0bc9febe 100644 --- a/src/main/asciidoc/reference/cassandra.adoc +++ b/src/main/asciidoc/reference/cassandra.adoc @@ -1209,7 +1209,7 @@ using Jackson 2 is shown below: import org.springframework.core.convert.converter.Converter; import org.springframework.util.StringUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; static class PersonWriteConverter implements Converter { @@ -1235,7 +1235,7 @@ using Jackson 2 is shown below: import org.springframework.core.convert.converter.Converter; import org.springframework.util.StringUtils; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; static class PersonReadConverter implements Converter {