Skip to content

Commit 2619c2e

Browse files
randallwhitmanrandallwhitman
authored
Jackson - all com.fasterxml no org.codehaus (#196)
1 parent e0e2dd2 commit 2619c2e

File tree

5 files changed

+60
-23
lines changed

5 files changed

+60
-23
lines changed

‎build.xml

100755100644
+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Not maintained - see pom.xml -->
12
<project name="esri-spatial-all" default="all" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
23

34
<property name="dir.build" value="build" />

‎hive/src/main/java/com/esri/hadoop/hive/ST_GeomFromJson.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
1313
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
1414
import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector.PrimitiveCategory;
15-
import org.codehaus.jackson.JsonFactory;
16-
import org.codehaus.jackson.JsonParseException;
15+
import com.fasterxml.jackson.core.JsonFactory;
16+
import com.fasterxml.jackson.core.JsonParseException;
1717

1818
import com.esri.core.geometry.ogc.OGCGeometry;
1919

‎hive/src/test/java/com/esri/hadoop/hive/serde/TestEsriJsonSerDe.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.apache.hadoop.io.Text;
2828
import org.apache.hadoop.io.Writable;
2929

30-
import org.codehaus.jackson.JsonNode;
31-
import org.codehaus.jackson.map.ObjectMapper;
30+
import com.fasterxml.jackson.databind.JsonNode;
31+
import com.fasterxml.jackson.databind.ObjectMapper;
3232

3333
import com.esri.core.geometry.Geometry;
3434
import com.esri.core.geometry.Point;
@@ -59,7 +59,7 @@ public void TestIntWrite() throws Exception {
5959
JsonNode jn = new ObjectMapper().readTree(((Text)jsw).toString());
6060
jn = jn.findValue("attributes");
6161
jn = jn.findValue("num");
62-
Assert.assertEquals(7, jn.getIntValue());
62+
Assert.assertEquals(7, jn.asInt());
6363
}
6464

6565
@Test
@@ -80,7 +80,7 @@ public void TestEpochWrite() throws Exception {
8080
JsonNode jn = new ObjectMapper().readTree(((Text)jsw).toString());
8181
jn = jn.findValue("attributes");
8282
jn = jn.findValue("when");
83-
Assert.assertEquals(epoch/day, jn.getLongValue()/day);
83+
Assert.assertEquals(epoch/day, jn.asLong()/day);
8484

8585
epoch = 1641578400000L; // 2022-01-07 18:00 UTC
8686
//long zoned = epoch - TimeZone.getDefault().getOffset(epoch);
@@ -91,7 +91,7 @@ public void TestEpochWrite() throws Exception {
9191
jn = new ObjectMapper().readTree(((Text)jsw).toString());
9292
jn = jn.findValue("attributes");
9393
jn = jn.findValue("when");
94-
Assert.assertEquals(epoch/day, jn.getLongValue()/day);
94+
Assert.assertEquals(epoch/day, jn.asLong()/day);
9595
}
9696

9797
@Test
@@ -111,7 +111,7 @@ public void TestTimeWrite() throws Exception {
111111
JsonNode jn = new ObjectMapper().readTree(((Text)jsw).toString());
112112
jn = jn.findValue("attributes");
113113
jn = jn.findValue("when");
114-
java.sql.Timestamp actual = new java.sql.Timestamp(jn.getLongValue());
114+
java.sql.Timestamp actual = new java.sql.Timestamp(jn.asLong());
115115
Assert.assertEquals(epoch, actual.getTime());
116116
}
117117

‎hive/src/test/java/com/esri/hadoop/hive/serde/TestGeoJsonSerDe.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import org.apache.hadoop.io.Text;
1818
import org.apache.hadoop.io.Writable;
1919

20-
import org.codehaus.jackson.JsonNode;
21-
import org.codehaus.jackson.map.ObjectMapper;
20+
import com.fasterxml.jackson.databind.JsonNode;
21+
import com.fasterxml.jackson.databind.ObjectMapper;
2222

2323
import com.esri.core.geometry.Geometry;
2424
import com.esri.core.geometry.Point;
@@ -49,7 +49,7 @@ public void TestIntWrite() throws Exception {
4949
JsonNode jn = new ObjectMapper().readTree(((Text)jsw).toString());
5050
jn = jn.findValue("properties");
5151
jn = jn.findValue("num");
52-
Assert.assertEquals(7, jn.getIntValue());
52+
Assert.assertEquals(7, jn.asInt());
5353
}
5454

5555
@Test
@@ -69,7 +69,7 @@ public void TestEpochWrite() throws Exception {
6969
JsonNode jn = new ObjectMapper().readTree(((Text)jsw).toString());
7070
jn = jn.findValue("properties");
7171
jn = jn.findValue("when");
72-
Assert.assertEquals(epoch/day, jn.getLongValue()/day);
72+
Assert.assertEquals(epoch/day, jn.asLong()/day);
7373

7474
epoch = 1641578400000L; // 2022-01-07 18:00 UTC
7575
//long zoned = epoch - TimeZone.getDefault().getOffset(epoch);
@@ -81,7 +81,7 @@ public void TestEpochWrite() throws Exception {
8181
jn = jn.findValue("properties");
8282
jn = jn.findValue("when");
8383
System.err.println(jn);
84-
Assert.assertEquals(epoch/day, jn.getLongValue()/day);
84+
Assert.assertEquals(epoch/day, jn.asLong()/day);
8585
}
8686

8787
@Test

‎pom.xml

100755100644
+46-10
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,36 @@
152152
<jackson.version>2.13.5</jackson.version>
153153
</properties>
154154
</profile>
155+
<profile>
156+
<id>jackson-2.14</id>
157+
<properties>
158+
<jackson.version>2.14.3</jackson.version>
159+
</properties>
160+
</profile>
161+
<profile>
162+
<id>jackson-2.15</id>
163+
<properties>
164+
<jackson.version>2.15.4</jackson.version>
165+
</properties>
166+
</profile>
167+
<profile>
168+
<id>jackson-2.16</id>
169+
<properties>
170+
<jackson.version>2.16.2</jackson.version>
171+
</properties>
172+
</profile>
173+
<profile>
174+
<id>jackson-2.17</id>
175+
<properties>
176+
<jackson.version>2.17.3</jackson.version>
177+
</properties>
178+
</profile>
179+
<profile>
180+
<id>jackson-2.18</id>
181+
<properties>
182+
<jackson.version>2.18.2</jackson.version>
183+
</properties>
184+
</profile>
155185

156186
<profile>
157187
<id>geometry-2.2.0</id>
@@ -259,7 +289,13 @@
259289
<profile>
260290
<id>hadoop-3.3</id>
261291
<properties>
262-
<hadoop.version>3.3.4</hadoop.version>
292+
<hadoop.version>3.3.6</hadoop.version>
293+
</properties>
294+
</profile>
295+
<profile>
296+
<id>hadoop-3.4</id>
297+
<properties>
298+
<hadoop.version>3.4.1</hadoop.version>
263299
</properties>
264300
</profile>
265301

@@ -302,7 +338,7 @@
302338
<profile>
303339
<id>hive-2.3</id>
304340
<properties>
305-
<hive.version>2.3.9</hive.version>
341+
<hive.version>2.3.10</hive.version>
306342
</properties>
307343
</profile>
308344
<profile>
@@ -320,7 +356,7 @@
320356
<profile>
321357
<id>hive-4.0</id>
322358
<properties>
323-
<hive.version>4.0.0</hive.version> <!-- -alpha-2 -->
359+
<hive.version>4.0.1</hive.version>
324360
</properties>
325361
</profile>
326362

@@ -356,16 +392,16 @@
356392
<properties>
357393
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
358394

359-
<java.source.version>1.6</java.source.version>
360-
<java.target.version>1.6</java.target.version>
395+
<java.source.version>1.8</java.source.version>
396+
<java.target.version>1.8</java.target.version>
361397

362398
<!-- Versions for dependencies -->
363-
<hadoop.version>3.3.1</hadoop.version>
364-
<hive.version>3.1.2</hive.version>
365-
<jackson.version>2.13.1</jackson.version>
366-
<logging.version>1.1.3</logging.version>
399+
<hadoop.version>3.3.6</hadoop.version>
400+
<hive.version>3.1.3</hive.version>
401+
<jackson.version>2.16.2</jackson.version>
402+
<logging.version>1.3.4</logging.version> <!-- Hive-3.1+ -->
367403
<geometry.version>2.2.4</geometry.version>
368-
<junit.version>4.11</junit.version>
404+
<junit.version>4.13.2</junit.version>
369405

370406
<!-- Versions for plugins -->
371407
<compiler.plugin.version>2.3.2</compiler.plugin.version>

0 commit comments

Comments
 (0)