Skip to content

Commit 4b34d24

Browse files
virajjasaniapurtell
virajjasani
authored and
apurtell
committed
HBASE-22728 Jackson dependency cleanup and moving to Jackson2
Signed-off-by: Andrew Purtell <apurtell@apache.org>
1 parent 1f7458d commit 4b34d24

File tree

57 files changed

+1866
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1866
-121
lines changed

‎hbase-archetypes/hbase-client-project/pom.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,53 @@
6161
<version>${project.version}</version>
6262
<scope>test</scope>
6363
</dependency>
64+
<dependency>
65+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
66+
<artifactId>jackson-jaxrs-json-provider</artifactId>
67+
<scope>test</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>com.fasterxml.jackson.core</groupId>
71+
<artifactId>jackson-annotations</artifactId>
72+
<scope>test</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>com.fasterxml.jackson.core</groupId>
76+
<artifactId>jackson-core</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.fasterxml.jackson.core</groupId>
81+
<artifactId>jackson-databind</artifactId>
82+
<scope>test</scope>
83+
</dependency>
6484
<dependency>
6585
<groupId>org.apache.hbase</groupId>
6686
<artifactId>hbase-client</artifactId>
6787
<version>${project.version}</version>
88+
<exclusions>
89+
<exclusion>
90+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
91+
<artifactId>jackson-jaxrs-json-provider</artifactId>
92+
</exclusion>
93+
<exclusion>
94+
<groupId>com.fasterxml.jackson.core</groupId>
95+
<artifactId>jackson-annotations</artifactId>
96+
</exclusion>
97+
<exclusion>
98+
<groupId>com.fasterxml.jackson.core</groupId>
99+
<artifactId>jackson-core</artifactId>
100+
</exclusion>
101+
<exclusion>
102+
<groupId>com.fasterxml.jackson.core</groupId>
103+
<artifactId>jackson-databind</artifactId>
104+
</exclusion>
105+
</exclusions>
106+
</dependency>
107+
<dependency>
108+
<groupId>org.codehaus.jackson</groupId>
109+
<artifactId>jackson-mapper-asl</artifactId>
110+
<scope>test</scope>
68111
</dependency>
69112
<dependency>
70113
<groupId>junit</groupId>

‎hbase-archetypes/hbase-shaded-client-project/pom.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,36 @@
6161
<version>${project.version}</version>
6262
<scope>test</scope>
6363
</dependency>
64+
<dependency>
65+
<groupId>org.codehaus.jackson</groupId>
66+
<artifactId>jackson-mapper-asl</artifactId>
67+
<scope>test</scope>
68+
</dependency>
6469
<dependency>
6570
<groupId>org.apache.hbase</groupId>
6671
<artifactId>hbase-shaded-client</artifactId>
6772
<version>${project.version}</version>
6873
</dependency>
74+
<dependency>
75+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
76+
<artifactId>jackson-jaxrs-json-provider</artifactId>
77+
<scope>test</scope>
78+
</dependency>
79+
<dependency>
80+
<groupId>com.fasterxml.jackson.core</groupId>
81+
<artifactId>jackson-annotations</artifactId>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>com.fasterxml.jackson.core</groupId>
86+
<artifactId>jackson-core</artifactId>
87+
<scope>test</scope>
88+
</dependency>
89+
<dependency>
90+
<groupId>com.fasterxml.jackson.core</groupId>
91+
<artifactId>jackson-databind</artifactId>
92+
<scope>test</scope>
93+
</dependency>
6994
<dependency>
7095
<groupId>junit</groupId>
7196
<artifactId>junit</artifactId>

‎hbase-assembly/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@
164164
<groupId>org.apache.hbase</groupId>
165165
<artifactId>hbase-server</artifactId>
166166
</dependency>
167+
<dependency>
168+
<groupId>org.apache.hbase</groupId>
169+
<artifactId>hbase-rest</artifactId>
170+
</dependency>
167171
<dependency>
168172
<groupId>org.apache.hbase</groupId>
169173
<artifactId>hbase-thrift</artifactId>
@@ -219,5 +223,9 @@
219223
<version>${project.version}</version>
220224
<optional>true</optional>
221225
</dependency>
226+
<dependency>
227+
<groupId>org.codehaus.jackson</groupId>
228+
<artifactId>jackson-mapper-asl</artifactId>
229+
</dependency>
222230
</dependencies>
223231
</project>

‎hbase-client/pom.xml

Lines changed: 71 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,64 @@
125125
<dependency>
126126
<groupId>org.apache.hbase</groupId>
127127
<artifactId>hbase-common</artifactId>
128+
<exclusions>
129+
<exclusion>
130+
<groupId>org.apache.avro</groupId>
131+
<artifactId>avro</artifactId>
132+
</exclusion>
133+
<exclusion>
134+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
135+
<artifactId>jackson-jaxrs-json-provider</artifactId>
136+
</exclusion>
137+
<exclusion>
138+
<groupId>com.fasterxml.jackson.core</groupId>
139+
<artifactId>jackson-annotations</artifactId>
140+
</exclusion>
141+
<exclusion>
142+
<groupId>com.fasterxml.jackson.core</groupId>
143+
<artifactId>jackson-core</artifactId>
144+
</exclusion>
145+
<exclusion>
146+
<groupId>com.fasterxml.jackson.core</groupId>
147+
<artifactId>jackson-databind</artifactId>
148+
</exclusion>
149+
<exclusion>
150+
<groupId>org.codehaus.jackson</groupId>
151+
<artifactId>jackson-mapper-asl</artifactId>
152+
</exclusion>
153+
</exclusions>
128154
</dependency>
129155
<dependency>
130156
<groupId>org.apache.hbase</groupId>
131157
<artifactId>hbase-common</artifactId>
132158
<type>test-jar</type>
133159
<scope>test</scope>
160+
<exclusions>
161+
<exclusion>
162+
<groupId>org.apache.avro</groupId>
163+
<artifactId>avro</artifactId>
164+
</exclusion>
165+
<exclusion>
166+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
167+
<artifactId>jackson-jaxrs-json-provider</artifactId>
168+
</exclusion>
169+
<exclusion>
170+
<groupId>com.fasterxml.jackson.core</groupId>
171+
<artifactId>jackson-annotations</artifactId>
172+
</exclusion>
173+
<exclusion>
174+
<groupId>com.fasterxml.jackson.core</groupId>
175+
<artifactId>jackson-core</artifactId>
176+
</exclusion>
177+
<exclusion>
178+
<groupId>com.fasterxml.jackson.core</groupId>
179+
<artifactId>jackson-databind</artifactId>
180+
</exclusion>
181+
<exclusion>
182+
<groupId>org.codehaus.jackson</groupId>
183+
<artifactId>jackson-mapper-asl</artifactId>
184+
</exclusion>
185+
</exclusions>
134186
</dependency>
135187
<dependency>
136188
<groupId>org.apache.hbase</groupId>
@@ -174,8 +226,9 @@
174226
<artifactId>htrace-core</artifactId>
175227
</dependency>
176228
<dependency>
177-
<groupId>org.codehaus.jackson</groupId>
178-
<artifactId>jackson-mapper-asl</artifactId>
229+
<groupId>com.fasterxml.jackson.core</groupId>
230+
<artifactId>jackson-databind</artifactId>
231+
<scope>provided</scope>
179232
</dependency>
180233
<dependency>
181234
<groupId>org.jruby.jcodings</groupId>
@@ -282,6 +335,14 @@
282335
<groupId>tomcat</groupId>
283336
<artifactId>jasper-runtime</artifactId>
284337
</exclusion>
338+
<exclusion>
339+
<groupId>org.codehaus.jackson</groupId>
340+
<artifactId>jackson-core-asl</artifactId>
341+
</exclusion>
342+
<exclusion>
343+
<groupId>org.codehaus.jackson</groupId>
344+
<artifactId>jackson-mapper-asl</artifactId>
345+
</exclusion>
285346
</exclusions>
286347
</dependency>
287348
<dependency>
@@ -332,6 +393,14 @@
332393
<groupId>org.codehaus.jackson</groupId>
333394
<artifactId>jackson-xc</artifactId>
334395
</exclusion>
396+
<exclusion>
397+
<groupId>org.codehaus.jackson</groupId>
398+
<artifactId>jackson-core-asl</artifactId>
399+
</exclusion>
400+
<exclusion>
401+
<groupId>org.codehaus.jackson</groupId>
402+
<artifactId>jackson-mapper-asl</artifactId>
403+
</exclusion>
335404
</exclusions>
336405
</dependency>
337406
</dependencies>

‎hbase-client/src/main/java/org/apache/hadoop/hbase/util/JsonMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
*/
1919
package org.apache.hadoop.hbase.util;
2020

21+
import com.fasterxml.jackson.databind.ObjectMapper;
2122
import java.io.IOException;
2223
import java.util.Map;
2324

2425
import org.apache.hadoop.hbase.classification.InterfaceAudience;
2526
import org.apache.hadoop.hbase.classification.InterfaceStability;
26-
import org.codehaus.jackson.map.ObjectMapper;
2727

2828
/**
2929
* Utility class for converting objects to JSON

‎hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import static org.junit.Assert.assertEquals;
2121
import static org.junit.Assert.assertNotNull;
2222

23+
import com.fasterxml.jackson.databind.ObjectMapper;
2324
import java.io.IOException;
2425
import java.nio.ByteBuffer;
2526
import java.util.Arrays;
@@ -59,7 +60,6 @@
5960
import org.apache.hadoop.hbase.testclassification.SmallTests;
6061
import org.apache.hadoop.hbase.util.BuilderStyleTest;
6162
import org.apache.hadoop.hbase.util.Bytes;
62-
import org.codehaus.jackson.map.ObjectMapper;
6363
import org.junit.Assert;
6464
import org.junit.Test;
6565
import org.junit.experimental.categories.Category;

‎hbase-common/pom.xml

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,31 @@
272272
<artifactId>commons-io</artifactId>
273273
<scope>compile</scope>
274274
</dependency>
275+
<dependency>
276+
<groupId>org.codehaus.jackson</groupId>
277+
<artifactId>jackson-mapper-asl</artifactId>
278+
<scope>provided</scope>
279+
</dependency>
280+
<dependency>
281+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
282+
<artifactId>jackson-jaxrs-json-provider</artifactId>
283+
<scope>provided</scope>
284+
</dependency>
285+
<dependency>
286+
<groupId>com.fasterxml.jackson.core</groupId>
287+
<artifactId>jackson-annotations</artifactId>
288+
<scope>provided</scope>
289+
</dependency>
290+
<dependency>
291+
<groupId>com.fasterxml.jackson.core</groupId>
292+
<artifactId>jackson-core</artifactId>
293+
<scope>provided</scope>
294+
</dependency>
295+
<dependency>
296+
<groupId>com.fasterxml.jackson.core</groupId>
297+
<artifactId>jackson-databind</artifactId>
298+
<scope>provided</scope>
299+
</dependency>
275300
<dependency>
276301
<groupId>com.google.protobuf</groupId>
277302
<artifactId>protobuf-java</artifactId>
@@ -286,10 +311,6 @@
286311
<artifactId>htrace-core</artifactId>
287312
</dependency>
288313
<!-- transitive coalescing -->
289-
<dependency>
290-
<groupId>org.apache.avro</groupId>
291-
<artifactId>avro</artifactId>
292-
</dependency>
293314
</dependencies>
294315

295316
<profiles>
@@ -399,6 +420,14 @@
399420
<groupId>tomcat</groupId>
400421
<artifactId>jasper-runtime</artifactId>
401422
</exclusion>
423+
<exclusion>
424+
<groupId>org.codehaus.jackson</groupId>
425+
<artifactId>jackson-core-asl</artifactId>
426+
</exclusion>
427+
<exclusion>
428+
<groupId>org.codehaus.jackson</groupId>
429+
<artifactId>jackson-mapper-asl</artifactId>
430+
</exclusion>
402431
</exclusions>
403432
</dependency>
404433
<dependency>
@@ -449,6 +478,14 @@
449478
<groupId>org.codehaus.jackson</groupId>
450479
<artifactId>jackson-xc</artifactId>
451480
</exclusion>
481+
<exclusion>
482+
<groupId>org.codehaus.jackson</groupId>
483+
<artifactId>jackson-core-asl</artifactId>
484+
</exclusion>
485+
<exclusion>
486+
<groupId>org.codehaus.jackson</groupId>
487+
<artifactId>jackson-mapper-asl</artifactId>
488+
</exclusion>
452489
</exclusions>
453490
</dependency>
454491
</dependencies>

0 commit comments

Comments
 (0)