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

DATACASS-418 - Remove Jackson 1 usage.

Browse Source
This commit is contained in:
Mark Paluch
2017-03-24 10:57:52 +01:00
parent 8597589ce3
commit ed7565273e
9 changed files with 20 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pom.xml
View File

@@ -183,20 +183,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>

10
spring-cql/pom.xml
View File

@@ -63,16 +63,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>

27
spring-cql/template.mf
View File

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

26
spring-data-cassandra/pom.xml
View File

@@ -112,24 +112,26 @@
<artifactId>cassandra-all</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson}</version>
<scope>test</scope>
</dependency>
<!-- JSR 303 Validation -->
<dependency>
<groupId>javax.validation</groupId>

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/convert/CustomConversionIntegrationTests.java
View File

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

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/mapping/CreateTableSpecificationBasicCassandraMappingContextUnitTests.java
View File

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

4
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/conversion/ParameterConversionTestSupport.java
View File

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

32
spring-data-cassandra/template.mf
View File

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

4
src/main/asciidoc/reference/cassandra.adoc
View File

@@ -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<Person, String> {
@@ -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<String, Person> {