Repository: incubator-htrace Updated Branches: refs/heads/master 4d4ed2cb1 -> 26fdb7cd8
Revert "HTRACE-148. TestHTracedRESTReceiver should use the shaded ObjectMapper to avoid TestHTracedRESTReceiver failure (Masatake Iwasaki via Colin P. McCabe)" This reverts commit 4d4ed2cb1772d687afe04fc73e3c225cb6243de4. Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/26fdb7cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/26fdb7cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/26fdb7cd Branch: refs/heads/master Commit: 26fdb7cd8344a8df542096905585af9b76f90e2d Parents: 4d4ed2c Author: Colin P. Mccabe <[email protected]> Authored: Wed Apr 22 12:34:43 2015 -0700 Committer: Colin P. Mccabe <[email protected]> Committed: Wed Apr 22 12:34:43 2015 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/htrace/impl/TestHTracedRESTReceiver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/26fdb7cd/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 static org.junit.Assert.assertTrue; 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;
