commit 26fdb7cd8344a8df542096905585af9b76f90e2d
author Colin P. Mccabe <cmccabe@apache.org> Wed Apr 22 12:34:43 2015 -0700
committer Colin P. Mccabe <cmccabe@apache.org> Wed Apr 22 12:34:43 2015 -0700
tree ad0a60cc4ee4aea5f7d3c11c5df4505aa38613e0
parent 4d4ed2cb1772d687afe04fc73e3c225cb6243de4

Revert "HTRACE-148. TestHTracedRESTReceiver should use the shaded ObjectMapper to avoid TestHTracedRESTReceiver failure (Masatake Iwasaki via Colin P. McCabe)"

This reverts commit 4d4ed2cb1772d687afe04fc73e3c225cb6243de4.

htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java

diff --git a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java
index b933a14..9a01005 100644
--- a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java
+++ b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java
@@ -24,7 +24,7 @@
 import java.io.File;
 import java.net.URL;
 
-import org.apache.htrace.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.htrace.HTraceConfiguration;