Skip to content

Commit 47c82a8

Browse files
akonczakakonczak
committed
DATAES-25 migrated to jackson v2.2.3
1 parent 655ccb0 commit 47c82a8

File tree

3 files changed

+175
-169
lines changed

3 files changed

+175
-169
lines changed

‎pom.xml

Lines changed: 170 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -1,172 +1,177 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4-
<modelVersion>4.0.0</modelVersion>
5-
6-
<groupId>org.springframework.data</groupId>
7-
<artifactId>spring-data-elasticsearch</artifactId>
8-
<version>1.0.0.BUILD-SNAPSHOT</version>
9-
10-
<parent>
11-
<groupId>org.springframework.data.build</groupId>
12-
<artifactId>spring-data-parent</artifactId>
13-
<version>1.2.0.RELEASE</version>
14-
<relativePath>../spring-data-build/parent/pom.xml</relativePath>
15-
</parent>
16-
17-
<name>Spring Data Elasticsearch</name>
18-
<description>Spring Data Implementation for Elasticsearch</description>
19-
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
20-
21-
<properties>
22-
23-
<dist.key>DATAES</dist.key>
24-
25-
<commonscollections>3.2.1</commonscollections>
26-
<commonslang>2.6</commonslang>
27-
<elasticsearch>0.90.6</elasticsearch>
28-
<jackson>1.9.2</jackson>
29-
<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
30-
31-
</properties>
32-
33-
<dependencies>
34-
35-
<!-- Spring -->
36-
<dependency>
37-
<groupId>org.springframework</groupId>
38-
<artifactId>spring-context</artifactId>
39-
<version>${spring}</version>
40-
<exclusions>
41-
<exclusion>
42-
<groupId>commons-logging</groupId>
43-
<artifactId>commons-logging</artifactId>
44-
</exclusion>
45-
</exclusions>
46-
</dependency>
47-
48-
<dependency>
49-
<groupId>org.springframework</groupId>
50-
<artifactId>spring-tx</artifactId>
51-
<version>${spring}</version>
52-
</dependency>
53-
54-
<!-- For JavaConfig -->
55-
<dependency>
56-
<groupId>cglib</groupId>
57-
<artifactId>cglib</artifactId>
58-
<version>2.2.2</version>
59-
<scope>test</scope>
60-
</dependency>
61-
62-
<!-- SPRING DATA -->
63-
<dependency>
64-
<groupId>org.springframework.data</groupId>
65-
<artifactId>spring-data-commons</artifactId>
66-
<version>${springdata.commons}</version>
67-
</dependency>
68-
69-
<!-- APACHE -->
70-
<dependency>
71-
<groupId>commons-lang</groupId>
72-
<artifactId>commons-lang</artifactId>
73-
<version>${commonslang}</version>
74-
</dependency>
75-
<dependency>
76-
<groupId>commons-collections</groupId>
77-
<artifactId>commons-collections</artifactId>
78-
<version>${commonscollections}</version>
79-
</dependency>
80-
81-
<!-- JODA Time -->
82-
<dependency>
83-
<groupId>joda-time</groupId>
84-
<artifactId>joda-time</artifactId>
85-
<version>${jodatime}</version>
86-
</dependency>
87-
88-
<!-- Elasticsearch -->
89-
<dependency>
90-
<groupId>org.elasticsearch</groupId>
91-
<artifactId>elasticsearch</artifactId>
92-
<version>${elasticsearch}</version>
93-
</dependency>
94-
95-
<!-- Jackson JSON Mapper -->
96-
<dependency>
97-
<groupId>org.codehaus.jackson</groupId>
98-
<artifactId>jackson-mapper-asl</artifactId>
99-
<version>${jackson}</version>
100-
</dependency>
101-
102-
<!-- CDI -->
103-
<dependency>
104-
<groupId>javax.enterprise</groupId>
105-
<artifactId>cdi-api</artifactId>
106-
<version>${cdi}</version>
107-
<scope>provided</scope>
108-
<optional>true</optional>
109-
</dependency>
110-
111-
<!-- Test -->
112-
<dependency>
113-
<groupId>org.springframework</groupId>
114-
<artifactId>spring-test</artifactId>
115-
<version>${spring}</version>
116-
<scope>test</scope>
117-
</dependency>
118-
<dependency>
119-
<groupId>org.apache.openwebbeans.test</groupId>
120-
<artifactId>cditest-owb</artifactId>
121-
<version>${webbeans}</version>
122-
<scope>test</scope>
123-
</dependency>
124-
125-
</dependencies>
126-
127-
<build>
128-
<plugins>
129-
<plugin>
130-
<groupId>org.apache.maven.plugins</groupId>
131-
<artifactId>maven-assembly-plugin</artifactId>
132-
</plugin>
133-
<plugin>
134-
<groupId>org.codehaus.mojo</groupId>
135-
<artifactId>wagon-maven-plugin</artifactId>
136-
</plugin>
137-
</plugins>
138-
</build>
139-
140-
<developers>
141-
<developer>
142-
<id>biomedcentral</id>
143-
<name>BioMed Central Development Team</name>
144-
<timezone>+0</timezone>
145-
</developer>
146-
</developers>
147-
148-
<repositories>
149-
<repository>
150-
<id>spring-libs-snapshot</id>
151-
<url>http://repo.springsource.org/lib-snapshot-local</url>
152-
</repository>
153-
</repositories>
154-
155-
<scm>
156-
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
157-
<connection>scm:git:git://github.com/SpringSource/spring-data-elasticsearch.git</connection>
158-
<developerConnection>scm:git:ssh://[email protected]:SpringSource/spring-data-elasticsearch.git
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<modelVersion>4.0.0</modelVersion>
5+
6+
<groupId>org.springframework.data</groupId>
7+
<artifactId>spring-data-elasticsearch</artifactId>
8+
<version>1.0.0.BUILD-SNAPSHOT</version>
9+
10+
<parent>
11+
<groupId>org.springframework.data.build</groupId>
12+
<artifactId>spring-data-parent</artifactId>
13+
<version>1.2.0.RELEASE</version>
14+
<relativePath>../spring-data-build/parent/pom.xml</relativePath>
15+
</parent>
16+
17+
<name>Spring Data Elasticsearch</name>
18+
<description>Spring Data Implementation for Elasticsearch</description>
19+
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
20+
21+
<properties>
22+
23+
<dist.key>DATAES</dist.key>
24+
25+
<commonscollections>3.2.1</commonscollections>
26+
<commonslang>2.6</commonslang>
27+
<elasticsearch>0.90.6</elasticsearch>
28+
<jackson>2.2.3</jackson>
29+
<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
30+
31+
</properties>
32+
33+
<dependencies>
34+
35+
<!-- Spring -->
36+
<dependency>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-context</artifactId>
39+
<version>${spring}</version>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>commons-logging</groupId>
43+
<artifactId>commons-logging</artifactId>
44+
</exclusion>
45+
</exclusions>
46+
</dependency>
47+
48+
<dependency>
49+
<groupId>org.springframework</groupId>
50+
<artifactId>spring-tx</artifactId>
51+
<version>${spring}</version>
52+
</dependency>
53+
54+
<!-- For JavaConfig -->
55+
<dependency>
56+
<groupId>cglib</groupId>
57+
<artifactId>cglib</artifactId>
58+
<version>2.2.2</version>
59+
<scope>test</scope>
60+
</dependency>
61+
62+
<!-- SPRING DATA -->
63+
<dependency>
64+
<groupId>org.springframework.data</groupId>
65+
<artifactId>spring-data-commons</artifactId>
66+
<version>${springdata.commons}</version>
67+
</dependency>
68+
69+
<!-- APACHE -->
70+
<dependency>
71+
<groupId>commons-lang</groupId>
72+
<artifactId>commons-lang</artifactId>
73+
<version>${commonslang}</version>
74+
</dependency>
75+
<dependency>
76+
<groupId>commons-collections</groupId>
77+
<artifactId>commons-collections</artifactId>
78+
<version>${commonscollections}</version>
79+
</dependency>
80+
81+
<!-- JODA Time -->
82+
<dependency>
83+
<groupId>joda-time</groupId>
84+
<artifactId>joda-time</artifactId>
85+
<version>${jodatime}</version>
86+
</dependency>
87+
88+
<!-- Elasticsearch -->
89+
<dependency>
90+
<groupId>org.elasticsearch</groupId>
91+
<artifactId>elasticsearch</artifactId>
92+
<version>${elasticsearch}</version>
93+
</dependency>
94+
95+
<!-- Jackson JSON Mapper -->
96+
<dependency>
97+
<groupId>com.fasterxml.jackson.core</groupId>
98+
<artifactId>jackson-core</artifactId>
99+
<version>${jackson}</version>
100+
</dependency>
101+
<dependency>
102+
<groupId>com.fasterxml.jackson.core</groupId>
103+
<artifactId>jackson-databind</artifactId>
104+
<version>${jackson}</version>
105+
</dependency>
106+
107+
<!-- CDI -->
108+
<dependency>
109+
<groupId>javax.enterprise</groupId>
110+
<artifactId>cdi-api</artifactId>
111+
<version>${cdi}</version>
112+
<scope>provided</scope>
113+
<optional>true</optional>
114+
</dependency>
115+
116+
<!-- Test -->
117+
<dependency>
118+
<groupId>org.springframework</groupId>
119+
<artifactId>spring-test</artifactId>
120+
<version>${spring}</version>
121+
<scope>test</scope>
122+
</dependency>
123+
<dependency>
124+
<groupId>org.apache.openwebbeans.test</groupId>
125+
<artifactId>cditest-owb</artifactId>
126+
<version>${webbeans}</version>
127+
<scope>test</scope>
128+
</dependency>
129+
130+
</dependencies>
131+
132+
<build>
133+
<plugins>
134+
<plugin>
135+
<groupId>org.apache.maven.plugins</groupId>
136+
<artifactId>maven-assembly-plugin</artifactId>
137+
</plugin>
138+
<plugin>
139+
<groupId>org.codehaus.mojo</groupId>
140+
<artifactId>wagon-maven-plugin</artifactId>
141+
</plugin>
142+
</plugins>
143+
</build>
144+
145+
<developers>
146+
<developer>
147+
<id>biomedcentral</id>
148+
<name>BioMed Central Development Team</name>
149+
<timezone>+0</timezone>
150+
</developer>
151+
</developers>
152+
153+
<repositories>
154+
<repository>
155+
<id>spring-libs-snapshot</id>
156+
<url>http://repo.springsource.org/lib-snapshot-local</url>
157+
</repository>
158+
</repositories>
159+
160+
<scm>
161+
<url>https://github.com/SpringSource/spring-data-elasticsearch</url>
162+
<connection>scm:git:git://github.com/SpringSource/spring-data-elasticsearch.git</connection>
163+
<developerConnection>scm:git:ssh://[email protected]:SpringSource/spring-data-elasticsearch.git
159164
</developerConnection>
160-
</scm>
165+
</scm>
161166

162-
<ciManagement>
163-
<system>Bamboo</system>
164-
<url>http://build.springsource.org/browse/SPRINGDATAES</url>
165-
</ciManagement>
167+
<ciManagement>
168+
<system>Bamboo</system>
169+
<url>http://build.springsource.org/browse/SPRINGDATAES</url>
170+
</ciManagement>
166171

167-
<issueManagement>
168-
<system>JIRA</system>
169-
<url>https://jira.springsource.org/browse/DATAES</url>
170-
</issueManagement>
172+
<issueManagement>
173+
<system>JIRA</system>
174+
<url>https://jira.springsource.org/browse/DATAES</url>
175+
</issueManagement>
171176

172177
</project>

‎src/main/java/org/springframework/data/elasticsearch/core/DefaultEntityMapper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
package org.springframework.data.elasticsearch.core;
22

3-
import org.codehaus.jackson.map.DeserializationConfig;
4-
import org.codehaus.jackson.map.ObjectMapper;
3+
import com.fasterxml.jackson.databind.DeserializationFeature;
4+
import com.fasterxml.jackson.databind.ObjectMapper;
55

66
import java.io.IOException;
77

88
/**
99
* DocumentMapper using jackson
1010
*
1111
* @author Artur Konczak
12+
* @author Petar Tahchiev
1213
*/
1314
public class DefaultEntityMapper implements EntityMapper {
1415

1516
private ObjectMapper objectMapper;
1617

1718
public DefaultEntityMapper() {
1819
objectMapper = new ObjectMapper();
19-
objectMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);
20+
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
2021
}
2122

2223
@Override

‎template.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Import-Template:
1010
javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,
1111
org.apache.commons.collections.*;version="${commonscollections:[=.=.=,+1.0.0)}";resolution:=optional,
1212
org.apache.commons.lang.*;version="${commonslang:[=.=.=,+1.0.0)}",
13-
org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}",
13+
com.fasterxml.jackson.*;version="${jackson:[=.=.=,+1.0.0)}";resolution:=optional,
1414
org.elasticsearch.*;version="${elasticsearch:[=.=.=,+1.0.0)}",
1515
org.joda.time.*;version="${jodatime:[=.=.=,+1.0.0)}",
1616
org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}",

0 commit comments

Comments
 (0)